com php-src: Merge branch 'PHP-5.4.40' into PHP-5.5.24: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/d ocument.c ext/fileinfo/fileinfo.c
ext/gd/gd.c ext/h ash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/ph ar/phar_internal.h ext/sqlite3/sqlite3.c ext/stan dard/link.c
ext/standard/streamsfuncs.c ext/xmlwriter/p hp_xmlwriter.c ext/zlib/zlib.c sapi/apache2handler/ sapi_apache2.c

Commit: 0cb9d75cb6dfea4ad31ea794856489854ff20e16 Author: Stanislav Malyshev <stas@php.net> Sat, 11 Apr 2015 16:56:12 -0700 Parents: b56f8022c8b66a58670115ac0e69ef81fd0a5fb9 12d3bdee3dfa6605024a72080d8a17c165c5ed24 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0cb9d75cb6dfea4ad31ea794856489854ff20e16 Log: Merge branch 'PHP-5.4.40' into PHP-5.5.24 * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable. Bugs: https://bugs.php.net/69324 https://bugs.php.net/69152 https://bugs.php.net/69353 https://bugs.php.net/69316 https://bugs.php.net/68486 https://bugs.php.net/69218 https://bugs.php.net/68819 https://bugs.php.net/68901 https://bugs.php.net/68740 https://bugs.php.net/66550 https://bugs.php.net/68601 https://bugs.php.net/69293 Changed paths: MM Zend/zend_exceptions.c MM ext/curl/interface.c MM ext/dom/document.c MM ext/fileinfo/fileinfo.c MM ext/gd/gd.c MM ext/hash/hash.c MM ext/pgsql/pgsql.c MM ext/phar/phar.c MM ext/phar/phar_internal.h MM ext/sqlite3/sqlite3.c MM ext/standard/link.c MM ext/standard/streamsfuncs.c MM ext/xmlwriter/php_xmlwriter.c MM ext/zlib/zlib.c MM sapi/apache2handler/sapi_apache2.c Diff: diff --cc ext/gd/gd.c index cbc1d2b,d258c3d..322325e --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -2351,10 -2434,11 +2351,10 @@@ static void _php_image_create_from(INTE gdImagePtr im = NULL; php_stream *stream; FILE * fp = NULL; -#ifdef HAVE_GD_JPG long ignore_warning; -#endif + if (image_type == PHP_GDIMG_TYPE_GD2PART) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sllll", &file, &file_len, &srcx, &srcy, &width, &height) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pllll", &file, &file_len, &srcx, &srcy, &width, &height) == FAILURE) { return; } if (width < 1 || height < 1) {