[PHP-CVS] cvs: php-src /ext/date php_date.c

[Ilia Alshanetsky]

iliaa           Fri Nov 23 00:15:37 2007 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  MFB: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.147&r2=1.148&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.147 php-src/ext/date/php_date.c:1.148
--- php-src/ext/date/php_date.c:1.147   Sun Oct  7 05:15:03 2007
+++ php-src/ext/date/php_date.c Fri Nov 23 00:15:37 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.147 2007/10/07 05:15:03 davidw Exp $ */
+/* $Id: php_date.c,v 1.148 2007/11/23 00:15:37 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -2223,6 +2223,8 @@
        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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php