- MFH: Apperently you can't store NULL pointer values into Zend hashes - god

  know why not - so we won't store those in the cache anymore.

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 1d8214b125a04b4ade6d4a7182e78801ea0eb8a2..73648d2d5e368a6dcb810fff805f27280353109f 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -190,9 +190,7 @@ static void _php_date_tzinfo_dtor(void *tzinfo)
 {
        timelib_tzinfo **tzi = (timelib_tzinfo **)tzinfo;
 
-       if (*tzi) {
-               timelib_tzinfo_dtor(*tzi);
-       }
+       timelib_tzinfo_dtor(*tzi);
 }
 
 /* {{{ PHP_RINIT_FUNCTION */
@@ -289,7 +287,9 @@ static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, timelib_tzdb *
        }
 
        tzi = timelib_parse_tzfile(formal_tzname, tzdb);
-       zend_hash_add(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
+       if (tzi) {
+               zend_hash_add(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
+       }
        return tzi;
 }
 /* }}} */