diff options
| author | Julien Pauli <jpauli@php.net> | 2016-09-02 17:02:25 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-09-02 17:02:25 +0200 |
| commit | e681b8771b41e7c5b2c7e68a33689ca19c8cfe6e (patch) | |
| tree | b1e79f3f825280431082399b453d3808f8d4d1a1 /ext/standard/php_smart_string.h | |
| parent | 01f4a52aaa43bf8c6e6a7c312316d4bd383ea68a (diff) | |
| parent | e14b14d026fd588117d8c976cb2dfdeafb45c8dd (diff) | |
| download | php-git-e681b8771b41e7c5b2c7e68a33689ca19c8cfe6e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix warning about sign-mismatch comparisons
Diffstat (limited to 'ext/standard/php_smart_string.h')
| -rw-r--r-- | ext/standard/php_smart_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h index 7038cff9bb..b8db164076 100644 --- a/ext/standard/php_smart_string.h +++ b/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); \ |