mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-17 07:18:15 +00:00
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
This commit is contained in:
@@ -209,9 +209,9 @@ void dump_buf(struct fbuf_t *b)
|
||||
if (i != 0)
|
||||
ast_log(LOG_WARNING, "%s\n", buf);
|
||||
memset(buf, '\0', sizeof(buf));
|
||||
sprintf(buf, "%04x: ", i);
|
||||
sprintf(buf, "%04x: ", (unsigned)i);
|
||||
}
|
||||
sprintf(buf + 6 + x*3, "%02x ", b->data[i]);
|
||||
sprintf(buf + 6 + x*3, "%02hhx ", b->data[i]);
|
||||
if (i > 31 && i < last2lines)
|
||||
i = last2lines - 1;
|
||||
}
|
||||
@@ -1056,7 +1056,7 @@ static int h264_decap(struct fbuf_t *b, uint8_t *data, int len)
|
||||
}
|
||||
/* first of all, check if the packet has F == 0 */
|
||||
if (data[0] & 0x80) {
|
||||
ast_log(LOG_WARNING, "--- forbidden packet; nal: %02x\n",
|
||||
ast_log(LOG_WARNING, "--- forbidden packet; nal: %02hhx\n",
|
||||
data[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user