X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_querystring_object.c;h=d629df045f2d93628b4ef65fc547293dcd836ef1;hb=c5daa65dcad8fd0a916038c7567f610ea34c6315;hp=c6a1bdbe93a49fb4df8717502309874a6d51fc11;hpb=d309416dd166624d97ee795bd87ee5b06714f932;p=m6w6%2Fext-http diff --git a/http_querystring_object.c b/http_querystring_object.c index c6a1bdb..d629df0 100644 --- 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);