mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +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:
@@ -723,7 +723,7 @@ static int manager_login(char *hostname)
|
||||
MD5Update(&md5, (unsigned char *)pass, strlen(pass));
|
||||
MD5Final(digest, &md5);
|
||||
for (x=0; x<16; x++)
|
||||
len += sprintf(md5key + len, "%2.2x", digest[x]);
|
||||
len += sprintf(md5key + len, "%02hhx", digest[x]);
|
||||
manager_action("Login",
|
||||
"AuthType: MD5\r\n"
|
||||
"Username: %s\r\n"
|
||||
|
@@ -390,14 +390,14 @@ static void rxqcheck (char *dir, char *queue, char *process)
|
||||
{
|
||||
for (n = 0, x = 0; x < udl; x++)
|
||||
{
|
||||
sprintf (tmp + n, "%02X", ud[x]);
|
||||
sprintf (tmp + n, "%02hX", ud[x]);
|
||||
n += 2;
|
||||
}
|
||||
setenv ("ud8", tmp, 1);
|
||||
}
|
||||
for (n = 0, x = 0; x < udl; x++)
|
||||
{
|
||||
sprintf (tmp + n, "%04X", ud[x]);
|
||||
sprintf (tmp + n, "%04hX", ud[x]);
|
||||
n += 4;
|
||||
}
|
||||
setenv ("ud16", tmp, 1);
|
||||
@@ -730,13 +730,13 @@ main (int argc, const char *argv[])
|
||||
{ /* use one byte hex */
|
||||
fprintf (f, "ud#");
|
||||
for (p = 0; p < udl; p++)
|
||||
fprintf (f, "%02X", ud[p]);
|
||||
fprintf (f, "%02hX", ud[p]);
|
||||
}
|
||||
} else
|
||||
{ /* use two byte hex */
|
||||
fprintf (f, "ud##");
|
||||
for (p = 0; p < udl; p++)
|
||||
fprintf (f, "%04X", ud[p]);
|
||||
fprintf (f, "%04hX", ud[p]);
|
||||
}
|
||||
fprintf (f, "\n");
|
||||
}
|
||||
|
Reference in New Issue
Block a user