From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 23 Nov 2007 00:15:24 +0000 (+0000)
Subject: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone)
X-Git-Tag: RELEASE_1_3_1~584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4e39692152deb8c2970dbdc80b5801c919c4682;p=php

Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone)
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index eb187b8a12..57205e44b0 100644
--- 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);