tony2001 Thu Jun 22 18:44:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c
Log:
MFH:
don't try to parse empty string, return false immediately
(fixes off-by-one)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.9&r2=1.43.2.45.2.10&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.9
php-src/ext/date/php_date.c:1.43.2.45.2.10
--- php-src/ext/date/php_date.c:1.43.2.45.2.9 Thu Jun 15 18:33:06 2006
+++ php-src/ext/date/php_date.c Thu Jun 22 18:44:31 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.9 2006/06/15 18:33:06 dmitry Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.10 2006/06/22 18:44:31 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1063,6 +1063,10 @@
RETURN_FALSE;
}
+ if (!time_len) {
+ RETURN_FALSE;
+ }
+
t = timelib_strtotime(times, time_len, &error, DATE_TIMEZONEDB);
error1 = error->error_count;
timelib_error_container_dtor(error);
@@ -1078,7 +1082,7 @@
timelib_tzinfo_dtor(t->tz_info);
}
- timelib_time_dtor(now);
+ timelib_time_dtor(now);
timelib_time_dtor(t);
if (error1 || error2) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
