Browse Source

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix warning about sign-mismatch comparisons
pull/2105/merge
Julien Pauli 10 years ago
parent
commit
e681b8771b
  1. 2
      ext/standard/php_smart_string.h

2
ext/standard/php_smart_string.h

@ -61,7 +61,7 @@
: newlen + SMART_STRING_PREALLOC; \
SMART_STRING_DO_REALLOC(d, what); \
} else { \
if(UNEXPECTED(n > SIZE_MAX - (d)->len)) { \
if(UNEXPECTED((size_t)n > SIZE_MAX - (d)->len)) { \
zend_error(E_ERROR, "String size overflow"); \
} \
newlen = (d)->len + (n); \

Loading…
Cancel
Save