com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/bz2/bz2.c ext/cur l/tests/curl_version_variation1.phpt
ext/gd/gd.c ext/mbstring/php_mbregex.c ext/phar/phar_object.c e xt/session/session.c ext/simplexml/simplexml.c ext/spl/ spl_fixedarray.c

Commit: 63f57b59016f45796a915173c2904217375c63de Author: Anatol Belski <ab@php.net> Mon, 12 May 2014 09:59:02 +0200 Parents: 1c5b63528111645ca932cd03a01a5b689fe5376e 072bbe95ea3a4c3a37b273cc83fa65c4802b4252 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63f57b59016f45796a915173c2904217375c63de Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: (29 commits) Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6 Add bug fix to NEWS Update UPGRADING according to bug fix fix test improve CURL tests to allow testing without separate server improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions... - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) - Move checking - Fixed missing NULL check in SimpleXMLElement::xpath() - Fixed missing NULL check updated NEWS Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream oops, 5.4 and 5.5 use malloc in TSRM ... Conflicts: ext/gd/gd.c Bugs: https://bugs.php.net/67199 https://bugs.php.net/67248 https://bugs.php.net/67247 https://bugs.php.net/67245 https://bugs.php.net/67238 Changed paths: MM ext/bz2/bz2.c MM ext/curl/tests/curl_version_variation1.phpt MM ext/gd/gd.c MM ext/mbstring/php_mbregex.c MM ext/phar/phar_object.c MM ext/session/session.c MM ext/simplexml/simplexml.c MM ext/spl/spl_fixedarray.c Diff: diff --cc ext/gd/gd.c index 4d9fa99,f67e80b..33bfa9a --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -5281,8 -5273,8 +5281,8 @@@ PHP_FUNCTION(imageaffine PHP_FUNCTION(imageaffinematrixget) { double affine[6]; - long type; + php_int_t type; - zval *options; + zval *options = NULL; zval **tmp; int res = GD_FALSE, i; diff --cc ext/spl/spl_fixedarray.c index ea91e60,2c5d5f6..86ecc9e --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@@ -116,10 -116,10 +116,10 @@@ static void spl_fixedarray_resize(spl_f array->elements = NULL; } } else if (size > array->size) { - array->elements = erealloc(array->elements, sizeof(zval *) * size); + array->elements = safe_erealloc(array->elements, size, sizeof(zval *), 0); memset(array->elements + array->size, '\0', sizeof(zval *) * (size - array->size)); } else { /* size < array->size */ - long i; + php_int_t i; for (i = size; i < array->size; i++) { if (array->elements[i]) {