From cd90395cb6ccbf381dc293d195fbb4616c907bd0 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Wed, 12 Oct 2005 19:49:59 +0000 Subject: [PATCH] - 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. --- ext/date/php_date.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 1d8214b125..73648d2d5e 100644 --- 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; } /* }}} */ -- 2.50.1