summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-10-02 07:19:21 -0700
committerXinchen Hui <laruence@gmail.com>2015-10-02 07:19:21 -0700
commitc98ea8465bd7a686cd7ee23c403b2f9dab6e3449 (patch)
tree91b7849a916f461927e31e7bc67c469c4c6bc430
parent0fd71d1184727ac31c1ab06bef140650a06e35b3 (diff)
downloadphp-git-c98ea8465bd7a686cd7ee23c403b2f9dab6e3449.tar.gz
Fixed bug #70619 (DateTimeImmutable segfault)
-rw-r--r--NEWS3
-rw-r--r--ext/date/php_date.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6b95607aef..5d5ff9d11c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2015, PHP 5.6.15
+- Date:
+ . Fixed bug #70619 (DateTimeImmutable segfault). (Laruence)
+
- Mysqlnd:
. Fixed bug #70384 (mysqli_real_query():Unknown type 245 sent by the server).
(Andrey)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 4eca65bb11..aca226768e 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2785,7 +2785,7 @@ PHP_METHOD(DateTimeImmutable, createFromMutable)
php_date_obj *new_obj = NULL;
php_date_obj *old_obj = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O!", &datetime_object, date_ce_date) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &datetime_object, date_ce_date) == FAILURE) {
return;
}