diff options
author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 09:54:00 +0000 |
---|---|---|
committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 09:54:00 +0000 |
commit | 9ae57e0dd6841dad6930a75d7907d32a1efff4d2 (patch) | |
tree | ee131dd37a2383d2be12aab71e5737db4292083a /res | |
parent | a3534b7c0547db14c87f3f2622786a40374a74ee (diff) |
Fix printf problems with high ascii characters after r413586 (1.8).
In r413586 (1.8) various casts were added to silence gcc 4.10 warnings.
Those fixes included things like:
-out += sprintf(out, "%%%02X", (unsigned char) *ptr);
+out += sprintf(out, "%%%02X", (unsigned) *ptr);
That works for low ascii characters, but for the high range that yields
e.g. FFFFFFC3 when C3 is expected.
This changeset:
- fixes those casts to use the 'hh' unsigned char modifier instead
- consistently uses %02x instead of %2.2x (or other non-standard usage)
- adds a few 'h' modifiers in various places
- fixes a 'replcaes' typo
- dev/urandon typo (in 13+ patch)
Review: https://reviewboard.asterisk.org/r/4263/
ASTERISK-24619 #close
Reported by: Stefan27 (on IRC)
........
Merged revisions 429673 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 429674 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/res_crypto.c | 2 | ||||
-rw-r--r-- | res/res_pktccops.c | 6 | ||||
-rw-r--r-- | res/res_rtp_asterisk.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index 12bedc49a..78b8df209 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -532,7 +532,7 @@ static void md52sum(char *sum, unsigned char *md5) { int x; for (x = 0; x < 16; x++) { - sum += sprintf(sum, "%02x", (unsigned)*(md5++)); + sum += sprintf(sum, "%02hhx", *(md5++)); } } diff --git a/res/res_pktccops.c b/res/res_pktccops.c index 87727d8ce..837e0f5e1 100644 --- a/res/res_pktccops.c +++ b/res/res_pktccops.c @@ -799,9 +799,9 @@ static void *do_pktccops(void *data) if ((idx = ast_poll_fd_index(pfds, nfds, cmts->sfd)) > -1 && (pfds[idx].revents & POLLIN)) { len = cops_getmsg(cmts->sfd, recmsg); if (len > 0) { - ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%.2x opcode=%i clienttype=0x%.4x msglength=%u\n", - cmts->name, (unsigned)recmsg->verflag, - recmsg->opcode, (unsigned)recmsg->clienttype, recmsg->length); + ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%02hhx opcode=%i clienttype=0x%04hx msglength=%u\n", + cmts->name, recmsg->verflag, + recmsg->opcode, recmsg->clienttype, recmsg->length); if (recmsg->object != NULL) { pobject = recmsg->object; while (pobject != NULL) { diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 1d7ccd9dc..68a90d19c 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1347,7 +1347,7 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con } for (i = 0; i < size; i++) { - sprintf(local_fingerprint, "%.2X:", (unsigned)fingerprint[i]); + sprintf(local_fingerprint, "%02hhX:", fingerprint[i]); local_fingerprint += 3; } @@ -1509,7 +1509,7 @@ static void ast_rtp_dtls_set_fingerprint(struct ast_rtp_instance *instance, enum rtp->remote_hash = hash; while ((value = strsep(&tmp, ":")) && (pos != (EVP_MAX_MD_SIZE - 1))) { - sscanf(value, "%02x", (unsigned int*)&rtp->remote_fingerprint[pos++]); + sscanf(value, "%02hhx", &rtp->remote_fingerprint[pos++]); } } |