luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mprintf: do not ignore length modifiers of %o, %x, %X

Browse Source 
There are uses of `%lx` and `%zx` in the codebase, but `parsefmt`
interpreted them as `%x`.

Closes #15348
This commit is contained in:
ArtSin 2024-10-21 19:48:37 +04:00 committed by Daniel Stenberg
parent f901ab84e6
commit 7ca164faba
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/mprintf.c
View File

@ -455,14 +455,29 @@ static int parsefmt(const char *format,
flags |= FLAGS_UNSIGNED; flags |= FLAGS_UNSIGNED;
break; break;
case 'o': case 'o':
if(flags & FLAGS_LONGLONG)
type = FORMAT_LONGLONG;
else if(flags & FLAGS_LONG)
type = FORMAT_LONG;
else
type = FORMAT_INT; type = FORMAT_INT;
flags |= FLAGS_OCTAL; flags |= FLAGS_OCTAL;
break; break;
case 'x': case 'x':
if(flags & FLAGS_LONGLONG)
type = FORMAT_LONGLONGU;
else if(flags & FLAGS_LONG)
type = FORMAT_LONGU;
else
type = FORMAT_INTU; type = FORMAT_INTU;
flags |= FLAGS_HEX|FLAGS_UNSIGNED; flags |= FLAGS_HEX|FLAGS_UNSIGNED;
break; break;
case 'X': case 'X':
if(flags & FLAGS_LONGLONG)
type = FORMAT_LONGLONGU;
else if(flags & FLAGS_LONG)
type = FORMAT_LONGU;
else
type = FORMAT_INTU; type = FORMAT_INTU;
flags |= FLAGS_HEX|FLAGS_UPPER|FLAGS_UNSIGNED; flags |= FLAGS_HEX|FLAGS_UPPER|FLAGS_UNSIGNED;
break; break;