Commitff9c1b1

committed

Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.

1 parentbc11e6f commitff9c1b1Copy full SHA for ff9c1b1

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2079,7 +2079,11 @@ static int date_object_compare_date(zval d1, zval d2 TSRMLS_DC)`
`2079`	`2079`	`instanceof_function(Z_OBJCE_P(d2),date_ce_dateTSRMLS_CC)) {`
`2080`	`2080`	`php_date_obj*o1=zend_object_store_get_object(d1TSRMLS_CC);`
`2081`	`2081`	`php_date_obj*o2=zend_object_store_get_object(d2TSRMLS_CC);`
`2082`		`-`
	`2082`	`+`
	`2083`	`+if (!o1->time\|\| !o2->time) {`
	`2084`	`+php_error_docref(NULLTSRMLS_CC,E_WARNING,"Trying to compare an incomplete DateTime object");`
	`2085`	`+return1;`
	`2086`	`+}`
`2083`	`2087`	`if (!o1->time->sse_uptodate) {`
`2084`	`2088`	`timelib_update_ts(o1->time,o1->time->tz_info);`
`2085`	`2089`	`}`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+--TEST--`
	`2`	`+Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)`
	`3`	`+--INI--`
	`4`	`+--FILE--`
	`5`	`+<?php`
	`6`	`+date_default_timezone_set('Europe/Prague');`
	`7`	`+var_dump(unserialize('O:8:"DateTime":0:{}') ==newDateTime);`
	`8`	`+?>`
	`9`	`+--EXPECTF--`
	`10`	`+Warning: %s: Trying to compare an incomplete DateTime object in %s on line %d`
	`11`	`+bool(false)`

Comments

(0)