From 8b6ecc449c780eccc630ed8f3e3ca090f5a57b64 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Wed, 17 Dec 2014 10:23:32 +0000 Subject: 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 --- addons/ooh323c/src/printHandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/ooh323c/src') diff --git a/addons/ooh323c/src/printHandler.c b/addons/ooh323c/src/printHandler.c index a2a443c97..953f17f31 100644 --- a/addons/ooh323c/src/printHandler.c +++ b/addons/ooh323c/src/printHandler.c @@ -269,7 +269,7 @@ static const char* octStrToString if (bufsiz > 1) buffer[1] = '\0'; for (i = 0; i < numocts; i++) { if (i < bufsiz - 1) { - sprintf (lbuf, "%02x", (unsigned)data[i]); + sprintf (lbuf, "%02hhx", (unsigned char)data[i]); strcat (&buffer[(i*2)+1], lbuf); } else break; -- cgit v1.2.3