diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-13 23:12:47 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-14 00:02:17 -0700 |
| commit | 489fd56fe37bf40a662931c2b4d5baa918f13e37 (patch) | |
| tree | a0f8a063a18716ae5250186eedfdcb6e3a5b3d39 | |
| parent | a44c89e8af7c2410f4bfc5e097be2a5d0639a60c (diff) | |
| download | php-git-489fd56fe37bf40a662931c2b4d5baa918f13e37.tar.gz | |
Fix bug #72275: don't allow smart_str to overflow int
| -rw-r--r-- | ext/standard/php_smart_str.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h index 1872fa8647..fc1a753dd5 100644 --- a/ext/standard/php_smart_str.h +++ b/ext/standard/php_smart_str.h @@ -63,6 +63,9 @@ newlen = (d)->len + (n); \ if (newlen >= (d)->a) { \ (d)->a = newlen + SMART_STR_PREALLOC; \ + if (UNEXPECTED((d)->a >= INT_MAX)) { \ + zend_error(E_ERROR, "String size overflow"); \ + } \ SMART_STR_DO_REALLOC(d, what); \ } \ } \ @@ -148,17 +151,17 @@ * for GCC compatible compilers, e.g. * * #define f(..) ({char *r;..;__r;}) - */ - + */ + static inline char *smart_str_print_long(char *buf, long num) { - char *r; - smart_str_print_long4(buf, num, unsigned long, r); + char *r; + smart_str_print_long4(buf, num, unsigned long, r); return r; } static inline char *smart_str_print_unsigned(char *buf, long num) { - char *r; - smart_str_print_unsigned4(buf, num, unsigned long, r); + char *r; + smart_str_print_unsigned4(buf, num, unsigned long, r); return r; } @@ -168,7 +171,7 @@ static inline char *smart_str_print_unsigned(char *buf, long num) { smart_str_print##func##4 (__b + sizeof(__b) - 1, (num), vartype, __t); \ smart_str_appendl_ex((dest), __t, __b + sizeof(__b) - 1 - __t, (type)); \ } while (0) - + #define smart_str_append_unsigned_ex(dest, num, type) \ smart_str_append_generic_ex((dest), (num), (type), unsigned long, _unsigned) |