summaryrefslogtreecommitdiff
path: root/main/http.c
diff options
context:
space:
mode:
authorWalter Doekes <walter+asterisk@wjd.nu>2014-12-17 10:23:32 +0000
committerWalter Doekes <walter+asterisk@wjd.nu>2014-12-17 10:23:32 +0000
commit8b6ecc449c780eccc630ed8f3e3ca090f5a57b64 (patch)
tree43b03098bd605892070fc93a70c74cc57e70c2a4 /main/http.c
parentc4cc668ba9682751d8617d1f49932bcacf43772f (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 'main/http.c')
-rw-r--r--main/http.c4
1 files changed, 2 insertions, 2 deletions
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;
}