com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: UPGRADING ext/spl/spl_array.c e
xt/spl/spl_directory.c ext/spl/spl_iterators.c

Commit: df0794469d321a3f8dc0e82ed6a0532e85cbd030 Author: Anatol Belski <ab@php.net> Fri, 6 Jun 2014 09:04:37 +0200 Parents: 112bf7331f180a10bf1ca7fcd5e6e9b4362fb15e d4cfc15514285d42f113facc1c296d32a818ccf2 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df0794469d321a3f8dc0e82ed6a0532e85cbd030 Log: Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 * origin/str_size_and_int64_56_backport: (35 commits) drop exec perm on doc files fix test for 5.4/5.5 add test for previous fix NEWS NEWS NEWS Fix regression introduce in fix for bug #67118 update news update NEWS Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS ... Bugs: https://bugs.php.net/67118 https://bugs.php.net/87 https://bugs.php.net/67072 https://bugs.php.net/67329 Changed paths: MM UPGRADING MM ext/spl/spl_array.c MM ext/spl/spl_directory.c MM ext/spl/spl_iterators.c Diff: diff --cc UPGRADING index 740047a,7a174c4..740047a mode 100755,100644..100644 --- a/UPGRADING +++ b/UPGRADING diff --cc ext/spl/spl_directory.c index efb05b5,151da4b7..4d5c97b --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@@ -837,8 -838,9 +838,9 @@@ SPL_METHOD(DirectoryIterator, seek int valid = 0; zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval); if (retval) { - valid = zend_is_true(retval); + valid = zend_is_true(retval TSRMLS_CC); zval_ptr_dtor(&retval); + retval = NULL; } if (!valid) { break;