com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/phar/phar.c ext/phar/phar_object.c ext/phar/tests/phar_extract.ph pt ext/standard/url.c

Commit: 62da5cdf3d01a39c004bafab48f1fb954ae5e17d Author: Stanislav Malyshev <stas@php.net> Mon, 28 Mar 2016 23:21:15 -0700 Parents: 54da966883bacf28808e26eeda48fe38e21b118e f8dd10508bd66b6eefb18d319577b443fb1e0c55 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=62da5cdf3d01a39c004bafab48f1fb954ae5e17d Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fix bug #71798 - Integer Overflow in php_raw_url_encode Fix bug #71860: Require valid paths for phar filenames Going for 5.5.34 Conflicts: configure.in ext/phar/tests/create_path_error.phpt main/php_version..h Bugs: https://bugs.php.net/71906 https://bugs.php.net/71798 https://bugs.php.net/71860 Changed paths: MM ext/phar/phar.c MM ext/phar/phar_object.c MM ext/phar/tests/phar_extract.phpt MM ext/standard/url.c Diff: diff --cc ext/phar/phar.c index 228dfca,17b0aff..14b80e1 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@@ -2240,8 -2259,12 +2240,12 @@@ int phar_split_fname(const char *filena #ifdef PHP_WIN32 char *save; #endif - int ext_len, free_filename = 0; + int ext_len; + if (CHECK_NULL_PATH(filename, filename_len)) { + return FAILURE; + } + if (!strncasecmp(filename, "phar://", 7)) { filename += 7; filename_len -= 7;