Ilia Alshanetsky · Ilia Alshanetsky · commit a4e39692152d · 2007-11-23T00:15:24.000Z
Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -2066,6 +2066,8 @@ PHP_METHOD(DateTimeZone, __construct)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len)) {
 		if (SUCCESS == timezone_initialize(&tzi, tz TSRMLS_CC)) {
 			((php_timezone_obj *) zend_object_store_get_object(getThis() TSRMLS_CC))->tz = tzi;
+		} else {
+			ZVAL_NULL(getThis());
 		}
 	}
 	php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);

Original file line number	Diff line number	Diff line change
`@@ -2066,6 +2066,8 @@ PHP_METHOD(DateTimeZone, __construct)`
`2066`	`2066`	`if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &tz, &tz_len)) {`
`2067`	`2067`	`if (SUCCESS == timezone_initialize(&tzi, tz TSRMLS_CC)) {`
`2068`	`2068`	`((php_timezone_obj *) zend_object_store_get_object(getThis() TSRMLS_CC))->tz = tzi;`
	`2069`	`+ } else {`
	`2070`	`+ ZVAL_NULL(getThis());`
`2069`	`2071`	`}`
`2070`	`2072`	`}`
`2071`	`2073`	`php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);`