gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Number parser shouldn't accept '0x' without hex digits.

Browse Source
This commit is contained in:
Mike Pall 2010-11-02 16:01:26 +01:00
parent 44372a4453
commit 188f0b04e1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lj_str.c
View File

@ -186,12 +186,14 @@ int LJ_FASTCALL lj_str_numconv(const char *s, TValue *n)
uint32_t k = (uint32_t)(*p++ - '0'); uint32_t k = (uint32_t)(*p++ - '0');
if (k == 0 && ((*p & ~0x20) == 'X')) { if (k == 0 && ((*p & ~0x20) == 'X')) {
p++; p++;
while (lj_ctype_isxdigit(*p)) { if (!lj_ctype_isxdigit(*p))
return 0; /* Don't accept '0x' without hex digits. */
do {
if (k >= 0x10000000) goto parsedbl; if (k >= 0x10000000) goto parsedbl;
k = (k << 4) + (*p & 15u); k = (k << 4) + (*p & 15u);
if (!lj_ctype_isdigit(*p)) k += 9; if (!lj_ctype_isdigit(*p)) k += 9;
p++; p++;
} } while (lj_ctype_isxdigit(*p));
} else { } else {
while ((uint32_t)(*p - '0') < 10) { while ((uint32_t)(*p - '0') < 10) {
if (k >= 0x19999999) goto parsedbl; if (k >= 0x19999999) goto parsedbl;
@ -209,10 +211,10 @@ parsedbl:
TValue tv; TValue tv;
char *endptr; char *endptr;
setnumV(&tv, lua_str2number(s, &endptr)); setnumV(&tv, lua_str2number(s, &endptr));
if (endptr == s) return 0; /* conversion failed */ if (endptr == s) return 0; /* Conversion failed. */
if (LJ_UNLIKELY(*endptr != '\0')) { if (LJ_UNLIKELY(*endptr != '\0')) {
while (lj_ctype_isspace((uint8_t)*endptr)) endptr++; while (lj_ctype_isspace((uint8_t)*endptr)) endptr++;
if (*endptr != '\0') return 0; /* invalid trailing characters? */ if (*endptr != '\0') return 0; /* Invalid trailing characters? */
} }
if (LJ_LIKELY(!tvisnan(&tv))) if (LJ_LIKELY(!tvisnan(&tv)))
setnumV(n, numV(&tv)); setnumV(n, numV(&tv));