cvs: php-src(PHP_5_3) /ext/date php_date.c

derick Wed Jul 16 12:35:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: - Fixed a segfault - simply a forgotten return; http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.44&r2=1.43.2.45.2.51.2.45&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.44 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.45 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.44 Mon Jul 14 17:38:33 2008 +++ php-src/ext/date/php_date.c Wed Jul 16 12:35:11 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.44 2008/07/14 17:38:33 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.45 2008/07/16 12:35:11 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -2928,6 +2928,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);