emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: @ in "\x3@" is not a valid hex digit

Browse Source 
function                                             old     new   delta
bb_process_escape_sequence                           134     141      +7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-11-29 12:34:50 +01:00
parent c100535571
commit 480c7e5dfb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libbb/process_escape_sequence.c
View File

@ -41,8 +41,16 @@ char FAST_FUNC bb_process_escape_sequence(const char **ptr)
unsigned d = (unsigned char)(*q) - '0'; unsigned d = (unsigned char)(*q) - '0';
#else #else
unsigned d = (unsigned char)_tolower(*q) - '0'; unsigned d = (unsigned char)_tolower(*q) - '0';
if (d >= 10) if (d >= 10) {
d += ('0' - 'a' + 10); //d += ('0' - 'a' + 10);
/* The above would maps 'A'-'F' and 'a'-'f' to 10-15,
* however, some chars like '@' would map to 9 < base.
* Do not allow that, map invalid chars to N > base:
*/
d += ('0' - 'a');
if ((int)d >= 0)
d += 10;
}
#endif #endif
if (d >= base) { if (d >= base) {
if (WANT_HEX_ESCAPES && base == 16) { if (WANT_HEX_ESCAPES && base == 16) {