]> granicus.if.org Git - php/commitdiff
The only reason that particular 'real solution' wasn't applied in the first place...
authorSteph Fox <sfox@php.net>
Fri, 20 Jun 2008 12:21:32 +0000 (12:21 +0000)
committerSteph Fox <sfox@php.net>
Fri, 20 Jun 2008 12:21:32 +0000 (12:21 +0000)
Maybe we don't need to call a non-existent dtor if we're going to physically apply zend_hash_graceful_reverse_destroy()?
- This works on my box, please test under *nix/OSX

ext/phar/phar.c

index ccec14f960f091df2686a837c3bfd2483236250f..af9fba71a86f23d7c9dfe535033127728ba9f9c2 100644 (file)
@@ -115,7 +115,7 @@ static void phar_split_cache_list(TSRMLS_D)
 
        /* fake request startup */
        PHAR_GLOBALS->request_init = 1;
-       if (zend_hash_init(&EG(regular_list), 0, NULL, list_entry_destructor, 0) == SUCCESS) {
+       if (zend_hash_init(&EG(regular_list), 0, NULL, NULL, 0) == SUCCESS) {
                EG(regular_list).nNextFreeElement=1;    /* we don't want resource id 0 */
        }
        PHAR_G(has_bz2) = zend_hash_exists(&module_registry, "bz2", sizeof("bz2"));