com php-src: Fix for #73240 - Write out of bounds at number_format: ext/standard/math.c

Commit: 8e2c9024a6755c092f80b385aa7b7487efdc8acc Author: Stanislav Malyshev <stas@php.net> Mon, 10 Oct 2016 23:42:50 -0700 Committer: Anatol Belski <ab@php.net> Fri, 14 Oct 2016 01:41:48 +0200 Parents: 0cf880e70ccae598b7f5d303c2728d2b150c9b9a Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8e2c9024a6755c092f80b385aa7b7487efdc8acc Log: Fix for #73240 - Write out of bounds at number_format (cherry picked from commit 8259130b6bc752968856b352c9e7f8e03a8c0a8e) (cherry picked from commit 01280f8deb837a61237a619cffa886d7f8c31963) Bugs: https://bugs.php.net/73240 Changed paths: M ext/standard/math.c Diff: diff --git a/ext/standard/math.c b/ext/standard/math.c index 83145a4..753656c 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -1139,18 +1139,14 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, char *dec_poin /* calculate the length of the return buffer */ if (dp) { - integral = (int)(dp - ZSTR_VAL(tmpbuf)); + integral = (dp - ZSTR_VAL(tmpbuf)); } else { /* no decimal point was found */ - integral = (int)ZSTR_LEN(tmpbuf); + integral = ZSTR_LEN(tmpbuf); } /* allow for thousand separators */ if (thousand_sep) { - if (integral + thousand_sep_len * ((integral-1) / 3) < integral) { - /* overflow */ - php_error_docref(NULL, E_ERROR, "String overflow"); - } integral += thousand_sep_len * ((integral-1) / 3); } @@ -1160,10 +1156,6 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, char *dec_poin reslen += dec; if (dec_point) { - if (reslen + dec_point_len < dec_point_len) { - /* overflow */ - php_error_docref(NULL, E_ERROR, "String overflow"); - } reslen += dec_point_len; } } @@ -1266,6 +1258,7 @@ PHP_FUNCTION(number_format) break; default: WRONG_PARAM_COUNT; + break; } } /* }}} */