From ff9c1b12ff9c9533367d0d6200eb39189ad0124c Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sun, 6 Jan 2013 13:38:22 +0000 Subject: Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. --- ext/date/php_date.c | 6 +++++- ext/date/tests/bug55397.phpt | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ext/date/tests/bug55397.phpt diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 2b4b4b50ea..2e616b1704 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2079,7 +2079,11 @@ static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC) instanceof_function(Z_OBJCE_P(d2), date_ce_date TSRMLS_CC)) { php_date_obj *o1 = zend_object_store_get_object(d1 TSRMLS_CC); php_date_obj *o2 = zend_object_store_get_object(d2 TSRMLS_CC); - + + if (!o1->time || !o2->time) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to compare an incomplete DateTime object"); + return 1; + } if (!o1->time->sse_uptodate) { timelib_update_ts(o1->time, o1->time->tz_info); } diff --git a/ext/date/tests/bug55397.phpt b/ext/date/tests/bug55397.phpt new file mode 100644 index 0000000000..efc09b5047 --- /dev/null +++ b/ext/date/tests/bug55397.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV) +--INI-- +--FILE-- + +--EXPECTF-- +Warning: %s: Trying to compare an incomplete DateTime object in %s on line %d +bool(false) -- cgit v1.2.1