cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource README parse_date.re

derick Mon Jul 4 03:16:10 2005 EDT Modified files: /php-src/ext/date/lib parse_date.c /php-src/ext/date/lib/resource README parse_date.re Log: - Do not crash when the abbreviation doesn't exist. http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.22&r2=1.23&ty=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.22 php-src/ext/date/lib/parse_date.c:1.23 --- php-src/ext/date/lib/parse_date.c:1.22 Sun Jul 3 20:25:38 2005 +++ php-src/ext/date/lib/parse_date.c Mon Jul 4 03:16:08 2005 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.8 on Mon Jul 4 03:23:06 2005 */ +/* Generated by re2c 0.9.8.dev on Mon Jul 4 09:14:41 2005 */ #line 1 "resource/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.22 2005/07/04 00:25:38 sniper Exp $ */ +/* $Id: parse_date.c,v 1.23 2005/07/04 07:16:08 derick Exp $ */ #include "timelib.h" @@ -13845,7 +13845,11 @@ timelib_tz_lookup_table *tp; tp = zone_search(abbr, 0, sizeof(timelib_timezone_lookup) / sizeof(*timelib_timezone_lookup) - 1); - return (tp->full_tz_name); + if (tp) { + return (tp->full_tz_name); + } else { + return NULL; + } } #ifdef DEBUG_PARSER_STUB http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/README?r1=1.3&r2=1.4&ty=u Index: php-src/ext/date/lib/resource/README diff -u php-src/ext/date/lib/resource/README:1.3 php-src/ext/date/lib/resource/README:1.4 --- php-src/ext/date/lib/resource/README:1.3 Sun Jul 3 20:25:39 2005 +++ php-src/ext/date/lib/resource/README Mon Jul 4 03:16:09 2005 @@ -3,4 +3,4 @@ Make sure you use re2c 0.9.8dev or higher: -# re2c -d -b resource/parse_date.re > parse_date.c +/dat/dev/sf/re2c/re2c -d -b resource/parse_date.re > parse_date.c http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/parse_date.re?r1=1.19&r2=1.20&ty=u Index: php-src/ext/date/lib/resource/parse_date.re diff -u php-src/ext/date/lib/resource/parse_date.re:1.19 php-src/ext/date/lib/resource/parse_date.re:1.20 --- php-src/ext/date/lib/resource/parse_date.re:1.19 Sun Jul 3 17:38:53 2005 +++ php-src/ext/date/lib/resource/parse_date.re Mon Jul 4 03:16:09 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re,v 1.19 2005/07/03 21:38:53 derick Exp $ */ +/* $Id: parse_date.re,v 1.20 2005/07/04 07:16:09 derick Exp $ */ #include "timelib.h" @@ -1469,7 +1469,11 @@ timelib_tz_lookup_table *tp; tp = zone_search(abbr, 0, sizeof(timelib_timezone_lookup) / sizeof(*timelib_timezone_lookup) - 1); - return (tp->full_tz_name); + if (tp) { + return (tp->full_tz_name); + } else { + return NULL; + } } #ifdef DEBUG_PARSER_STUB