- fix overload guards leaks

[m6w6/ext-http] / http_querystring_object.c

diff --git a/http_querystring_object.c b/http_querystring_object.c
index 33e4356f947bbd4a31dd12d71e6afa1b614aaf1a..d629df045f2d93628b4ef65fc547293dcd836ef1 100644 (file)
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -198,11 +198,7 @@ void _http_querystring_object_free(zend_object *object TSRMLS_DC)
 {
        http_querystring_object *o = (http_querystring_object *) object;
 
-       if (OBJ_PROP(o)) {
-               zend_hash_destroy(OBJ_PROP(o));
-               FREE_HASHTABLE(OBJ_PROP(o));
-       }
-       efree(o);
+       freeObject(o);
 }
 
 /* {{{ querystring helpers */
@@ -216,7 +212,7 @@ static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
        
        MAKE_STD_ZVAL(zobj);
        Z_TYPE_P(zobj) = IS_OBJECT;
-       Z_OBJVAL_P(zobj) = http_querystring_object_new(http_querystring_object_ce);
+       zobj->value.obj = http_querystring_object_new(http_querystring_object_ce);
        zend_call_method_with_1_params(&zobj, Z_OBJCE_P(zobj), NULL, "__construct", NULL, zglobal);
        
        zval_ptr_dtor(&zglobal);
@@ -420,7 +416,7 @@ PHP_METHOD(HttpQueryString, mod)
                qarr = GET_PROP_EX(zobj, queryArray);
                qstr = GET_PROP_EX(zobj, queryString);
                
-               array_copy(orig, qarr);
+               http_querystring_modify(qarr, orig);
                http_querystring_modify(qarr, params);
                http_querystring_update(qarr, qstr);