derick          Wed Jul 16 12:35:45 2008 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  - MF53: Fixed segfault.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.195&r2=1.196&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.195 php-src/ext/date/php_date.c:1.196
--- php-src/ext/date/php_date.c:1.195   Mon Jul 14 17:38:19 2008
+++ php-src/ext/date/php_date.c Wed Jul 16 12:35:45 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.195 2008/07/14 17:38:19 derick Exp $ */
+/* $Id: php_date.c,v 1.196 2008/07/16 12:35:45 derick Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -3095,6 +3095,7 @@
        tzobj = (php_timezone_obj *) 
zend_object_store_get_object(timezone_object TSRMLS_CC);
        if (tzobj->type != TIMELIB_ZONETYPE_ID) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only do this 
for zones with ID for now");
+               return;
        }
        timelib_set_timezone(dateobj->time, tzobj->tzi.tz);
        timelib_unixtime2local(dateobj->time, dateobj->time->sse);



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

Reply via email to