zend_hash_get_current_key_ex does not accept NULL for position anymore

[m6w6/ext-http] / php_http_querystring.c

diff --git a/php_http_querystring.c b/php_http_querystring.c
index 77df3215dfaa7daaf6fc009944b050eda8ea12dd..84398a3b0d534ece1584caabd5ca65890a53f1af 100644 (file)
--- a/php_http_querystring.c
+++ b/php_http_querystring.c
@@ -39,6 +39,7 @@ static inline void php_http_querystring_set(zval *instance, zval *params, int fl
 
        php_http_querystring_update(&qa, params, NULL);
        zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), &qa);
+       zval_ptr_dtor(&qa);
 }
 
 static inline void php_http_querystring_str(zval *instance, zval *return_value)
@@ -185,8 +186,6 @@ ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size
                } while (*asi_str);
 
                opts.param = php_http_params_separator_init(&arr);
-
-               zval_ptr_dtor(&arr);
        }
 
        ZVAL_NULL(&opts.defval);
@@ -344,7 +343,7 @@ PHP_METHOD(HttpQueryString, getGlobalInstance)
        php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
 
        zs = zend_string_init(ZEND_STRL("instance"), 0);
-       instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0, NULL);
+       instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0);
        zend_string_release(zs);
 
        if (Z_TYPE_P(instance) != IS_OBJECT) {