mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-19 02:03:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "-0" parsing and optimized overflow check (Matt)

Browse Source
This commit is contained in:
Dmitry Stogov 2009-03-24 16:02:50 +00:00
parent a3e90c2a63
commit 4658d9408b
1 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Zend/zend_hash.h
View File

@ -314,47 +314,29 @@ END_EXTERN_C()
const char *end = key + length - 1; \
long idx; \
\
if (*end != '\0') { /* not a null terminated string */ \
if ((*end != '\0') /* not a null terminated string */ \
|| (*tmp == '0' && length > 2) /* numbers with leading zeros */ \
|| (end - tmp > MAX_LENGTH_OF_LONG - 1) /* number too long */ \
|| (SIZEOF_LONG == 4 && \
end - tmp == MAX_LENGTH_OF_LONG - 1 && \
*tmp > '2')) { /* overflow */ \
break; \
} else if (*tmp == '0') { \
if (end - tmp != 1) { \
/* don't accept numbers with leading zeros */ \
break; \
} \
idx = 0; \
} else if (end - tmp > MAX_LENGTH_OF_LONG - 1) { \
/* don't accept too long strings */ \
break; \
} else { \
if (end - tmp == MAX_LENGTH_OF_LONG - 1) { \
end--; /* check overflow in last digit later */ \
} \
idx = (*tmp++ - '0'); \
while (tmp != end && *tmp >= '0' && *tmp <= '9') { \
idx = (idx * 10) + (*tmp++ - '0'); \
} \
if (tmp != end) { \
break; \
} \
if (end != key + length - 1) { \
/* last digit can cause overflow */ \
if (*tmp < '0' || *tmp > '9' || idx > LONG_MAX / 10) { \
break; \
} \
idx = (idx * 10) + (*tmp - '0'); \
if (*key == '-') { \
idx = -idx; \
if (idx > 0) { /* overflow */ \
break; \
} \
} else if (idx < 0) { /* overflow */ \
break; \
} \
} else if (*key == '-') { \
idx = -idx; \
} \
} \
return func; \
idx = (*tmp - '0'); \
while (++tmp != end && *tmp >= '0' && *tmp <= '9') { \
idx = (idx * 10) + (*tmp - '0'); \
} \
if (tmp == end) { \
if (*key == '-') { \
idx = -idx; \
if (idx > 0) { /* overflow */ \
break; \
} \
} else if (idx < 0) { /* overflow */ \
break; \
} \
return func; \
} \
} \
} while (0)