com php-src: Some changes were lost in the merge commit of #66091: ext/date/php_date.c
| From: | Ferenc Kovacs | Date: | Wed, 27 Aug 2014 03:10:34 +0000 |
| Subject: | com php-src: Some changes were lost in the merge commit of #66091: ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81177@lists.php.net to get a copy of this message | ||
Commit: 7db10e43ac1edebc1697b52071b5fe85ec1a4ec1
Author: Tjerk Meesters <datibbaw@php.net> Wed, 13 Aug 2014 20:57:10 +0800
Committer: Ferenc Kovacs <tyrael@php.net> Wed, 27 Aug 2014 05:10:34 +0200
Parents: 5a1ff3bf50d22555a69d8e172e93dd0995c72040
Branches: PHP-5.6.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7db10e43ac1edebc1697b52071b5fe85ec1a4ec1
Log:
Some changes were lost in the merge commit of #66091
Bugs:
https://bugs.php.net/66091
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 64a40a2..29f8558 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2680,6 +2680,9 @@ PHP_FUNCTION(date_create_immutable)
if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str,
time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) {
zval_dtor(&datetime_object);
RETURN_FALSE;
+ } else {
+ zval *datetime_object_ptr = &datetime_object;
+ RETVAL_ZVAL(datetime_object_ptr, 0, 0);
}
RETVAL_ZVAL(&datetime_object, 0, 0);
}
@@ -2726,6 +2729,9 @@ PHP_FUNCTION(date_create_immutable_from_format)
if (!php_date_initialize(zend_object_store_get_object(&datetime_object TSRMLS_CC), time_str,
time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) {
zval_dtor(&datetime_object);
RETURN_FALSE;
+ } else {
+ zval *datetime_object_ptr = &datetime_object;
+ RETVAL_ZVAL(datetime_object_ptr, 0, 0);
}
RETVAL_ZVAL(&datetime_object, 0, 0);
}