nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix strtol("0xz", &s, 16) handling. 

Found by musl's libc-test.
This commit is contained in:
Jonas 'Sortie' Termansen 2014-08-19 21:52:38 +02:00
parent 88dd70991c
commit 0adfceef87
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/stdlib/strtol.cpp
View File

@ -164,7 +164,8 @@ STRTOL_INT STRTOL(const STRTOL_CHAR* restrict str,
// Skip the leading '0x' prefix in base 16 for hexadecimal integers.
if ( origbase == 16 &&
str[0] == STRTOL_L('0') &&
(str[1] == STRTOL_L('x') || str[1] == STRTOL_L('X')) )
(str[1] == STRTOL_L('x') || str[1] == STRTOL_L('X')) &&
(0 <= debase(str[2]) && debase(str[2]) < 16) )
str += 2;
// Determine what value will be returned on overflow/underflow.