diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 10:23:32 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-12-17 10:23:32 +0000 |
| commit | 8b6ecc449c780eccc630ed8f3e3ca090f5a57b64 (patch) | |
| tree | 43b03098bd605892070fc93a70c74cc57e70c2a4 /pbx | |
| parent | c4cc668ba9682751d8617d1f49932bcacf43772f (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
........
Merged revisions 429675 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/dundi-parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index ca219fd1e..c178fd654 100644 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -61,7 +61,7 @@ char *dundi_eid_to_str_short(char *s, int maxlen, dundi_eid *eid) *s = '\0'; } else { for (x=0;x<6;x++) { - sprintf(s, "%02X", (unsigned)eid->eid[x]); + sprintf(s, "%02hhX", (unsigned char)eid->eid[x]); s += 2; } } @@ -320,7 +320,7 @@ static void dump_encrypted(char *output, int maxlen, void *value, int len) if ((len > 16) && !(len % 16)) { /* Build up IV */ for (x=0;x<16;x++) { - snprintf(iv + (x << 1), 3, "%02x", (unsigned)((unsigned char *)value)[x]); + snprintf(iv + (x << 1), 3, "%02hhx", ((unsigned char *)value)[x]); } snprintf(output, maxlen, "[IV %s] %d encrypted blocks\n", iv, len / 16); } else @@ -334,7 +334,7 @@ static void dump_raw(char *output, int maxlen, void *value, int len) output[maxlen - 1] = '\0'; strcpy(output, "[ "); for (x=0;x<len;x++) { - snprintf(output + strlen(output), maxlen - strlen(output) - 1, "%02x ", (unsigned)u[x]); + snprintf(output + strlen(output), maxlen - strlen(output) - 1, "%02hhx ", u[x]); } strncat(output + strlen(output), "]", maxlen - strlen(output) - 1); } @@ -464,7 +464,7 @@ void dundi_showframe(struct dundi_hdr *fhi, int rx, struct sockaddr_in *sin, int } else { class = commands[(int)(fhi->cmdresp & 0x3f)]; } - snprintf(subclass2, (int)sizeof(subclass2), "%02x", (unsigned)fhi->cmdflags); + snprintf(subclass2, (int)sizeof(subclass2), "%02hhx", (unsigned char)fhi->cmdflags); subclass = subclass2; snprintf(tmp, (int)sizeof(tmp), "%s-Frame -- OSeqno: %3.3d ISeqno: %3.3d Type: %s (%s)\n", |