From 9ae57e0dd6841dad6930a75d7907d32a1efff4d2 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Wed, 17 Dec 2014 09:54:00 +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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429675 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/http.c') diff --git a/main/http.c b/main/http.c index 40615169c..a9e50cbc2 100644 --- a/main/http.c +++ b/main/http.c @@ -1030,8 +1030,8 @@ static int http_body_check_chunk_sync(struct ast_tcptls_session_instance *ser) return -1; } if (chunk_sync[0] != 0x0D || chunk_sync[1] != 0x0A) { - ast_log(LOG_WARNING, "HTTP chunk sync bytes wrong (0x%02X, 0x%02X)\n", - (unsigned) chunk_sync[0], (unsigned) chunk_sync[1]); + ast_log(LOG_WARNING, "HTTP chunk sync bytes wrong (0x%02hhX, 0x%02hhX)\n", + (unsigned char) chunk_sync[0], (unsigned char) chunk_sync[1]); return -1; } -- cgit v1.2.3