com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/date/ php_date.c ext/fileinfo/libmagic/cdf.c
sapi/phpdbg/ph pdbg.c sapi/phpdbg/phpdbg_watch.c

Commit: d4cfc15514285d42f113facc1c296d32a818ccf2 Author: Anatol Belski <ab@php.net> Fri, 6 Jun 2014 08:59:05 +0200 Parents: 4dc952b190dd4e9096aeb24acb7945fd25af6a52 6a5d5d1db43e670427f83760afbdec3b28eab3d0 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4cfc15514285d42f113facc1c296d32a818ccf2 Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: (24 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 ... Conflicts: ext/date/php_date.c Bugs: https://bugs.php.net/67118 https://bugs.php.net/87 https://bugs.php.net/67072 https://bugs.php.net/67329 Changed paths: MM ext/date/php_date.c MM ext/fileinfo/libmagic/cdf.c MM sapi/phpdbg/phpdbg.c MM sapi/phpdbg/phpdbg_watch.c Diff: diff --cc ext/date/php_date.c index 7fc4010,1809d66..f9dd31a --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -2715,10 -2730,8 +2717,8 @@@ PHP_METHOD(DateTime, __construct zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) { - ZVAL_NULL(getThis()); - } + php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); } zend_restore_error_handling(&error_handling TSRMLS_CC); }