]> granicus.if.org Git - php/commitdiff
- Do not crash when the abbreviation doesn't exist.
authorDerick Rethans <derick@php.net>
Mon, 4 Jul 2005 07:16:09 +0000 (07:16 +0000)
committerDerick Rethans <derick@php.net>
Mon, 4 Jul 2005 07:16:09 +0000 (07:16 +0000)
ext/date/lib/README
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
ext/date/lib/resource/README
ext/date/lib/resource/parse_date.re

index 559c52d7310be93a6c6c1a2944cf6162faa35ad2..2603bc7c6f7b58f06b4d14d1e6cffd8e7126968b 100644 (file)
@@ -3,4 +3,4 @@ Regenerating Parser
 
 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
index aca2b17706089130215955d492861ea083fc2018..12589e121db216b10b6bfcf103bbc496ce37172a 100644 (file)
@@ -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"
 /*
    +----------------------------------------------------------------------+
@@ -13845,7 +13845,11 @@ char *timelib_timezone_id_from_abbr(const char *abbr)
        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
index b050dad24ddee7bafdfca8178d040fe00015454a..ed20dddfc6031b5ec85c27be49c6781196a979a8 100644 (file)
@@ -1469,7 +1469,11 @@ char *timelib_timezone_id_from_abbr(const char *abbr)
        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
index 559c52d7310be93a6c6c1a2944cf6162faa35ad2..2603bc7c6f7b58f06b4d14d1e6cffd8e7126968b 100644 (file)
@@ -3,4 +3,4 @@ Regenerating Parser
 
 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
index b050dad24ddee7bafdfca8178d040fe00015454a..ed20dddfc6031b5ec85c27be49c6781196a979a8 100644 (file)
@@ -1469,7 +1469,11 @@ char *timelib_timezone_id_from_abbr(const char *abbr)
        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