com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/imap/php _imap.c ext/intl/locale/locale_methods.c ext/standa rd/exec.c ext/zip/php_zip.c

Commit: 25d04ad8e3e4b415645f982178a274f7a36eeef6 Author: Stanislav Malyshev <stas@php.net> Thu, 3 Nov 2016 22:53:05 -0700 Parents: 0bc6592307af27c81ab1717cc589adb2530565ac d858b4c77fa28ff9b0a597141a58f51803bafc2b Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25d04ad8e3e4b415645f982178a274f7a36eeef6 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Add length check for bzcompress too - fix for bug #73356 More string length checks & fixes More string length checks & fixes Bugs: https://bugs.php.net/73356 Changed paths: MM ext/imap/php_imap.c MM ext/intl/locale/locale_methods.c MM ext/standard/exec.c MM ext/zip/php_zip.c Diff: diff --cc ext/intl/locale/locale_methods.c index e35da2f,12cf6c1..6a5cd2e --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@@ -258,16 -258,19 +258,19 @@@ PHP_NAMED_FUNCTION(zif_locale_set_defau */ static zend_string* get_icu_value_internal( const char* loc_name , char* tag_name, int* result , int fromParseLocale) { - zend_string* tag_value = NULL; - int32_t tag_value_len = 512; + zend_string* tag_value = NULL; + int32_t tag_value_len = 512; - int singletonPos = 0; - char* mod_loc_name = NULL; - int grOffset = 0; + zend_off_t singletonPos = 0; + char* mod_loc_name = NULL; + zend_off_t grOffset = 0; - int32_t buflen = 512; - UErrorCode status = U_ZERO_ERROR; + int32_t buflen = 512; + UErrorCode status = U_ZERO_ERROR; + if (strlen(loc_name) > INTL_MAX_LOCALE_LEN) { + return NULL; + } if( strcmp(tag_name, LOC_CANONICALIZE_TAG) != 0 ){ /* Handle grandfathered languages */