]> granicus.if.org Git - php/commitdiff
Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone)
authorIlia Alshanetsky <iliaa@php.net>
Fri, 23 Nov 2007 00:15:24 +0000 (00:15 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Fri, 23 Nov 2007 00:15:24 +0000 (00:15 +0000)
ext/date/php_date.c

index eb187b8a125226268142b676cd14dc55bc63f500..57205e44b05016a6b833c737f85a517b5875df32 100644 (file)
@@ -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);