From: Michael Wallner <mike@php.net>
Date: Mon, 15 Jun 2015 13:50:34 +0000 (+0200)
Subject: fix leaks
X-Git-Tag: RELEASE_3_0_0_RC1~46
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1571b39b2988b27c93cfa2cd9114439784bff2d6;p=m6w6%2Fext-http

fix leaks
---

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 557bb10..9f01814 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -1337,7 +1337,7 @@ static PHP_METHOD(HttpEnvResponse, setCookie)
 	case IS_ARRAY:
 		list = php_http_cookie_list_from_struct(NULL, zcookie_new);
 		zcookie_new = &tmp;
-		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1);
+		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0);
 		break;
 
 	default:
@@ -1345,7 +1345,7 @@ static PHP_METHOD(HttpEnvResponse, setCookie)
 		list = php_http_cookie_list_parse(NULL, zs->val, zs->len, 0, NULL);
 		zend_string_release(zs);
 		zcookie_new = &tmp;
-		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 1);
+		ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0);
 	}
 	zend_restore_error_handling(&zeh);
 
diff --git a/php_http_message.c b/php_http_message.c
index 4f21a83..75d7fe5 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -496,7 +496,6 @@ void php_http_message_free(php_http_message_t **message)
 
 static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *rv);
 static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
-static HashTable *php_http_message_object_get_props(zval *object);
 
 static zend_object_handlers php_http_message_object_handlers;
 static HashTable php_http_message_object_prophandlers;
@@ -690,7 +689,8 @@ void php_http_message_object_reverse(zval *zmsg, zval *return_value)
 
 		/* add ref, because we previously have not been a parent message */
 		Z_ADDREF_P(zmsg);
-		RETVAL_OBJECT(&objects[last]->zo, 1);
+		/* no addref, because we've been a parent message previously */
+		RETVAL_OBJECT(&objects[last]->zo, 0);
 
 		efree(objects);
 	} else {
@@ -897,7 +897,7 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval
 	zend_string_release(member_name);
 }
 
-static HashTable *php_http_message_object_get_props(zval *object)
+static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_temp)
 {
 	zval tmp;
 	php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object);
@@ -906,6 +906,7 @@ static HashTable *php_http_message_object_get_props(zval *object)
 	size_t ver_len, url_len = 0;
 
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+	*is_temp = 0;
 	
 #define UPDATE_PROP(name_str, action_with_tmp) \
 	do { \
@@ -1971,7 +1972,7 @@ PHP_MINIT_FUNCTION(http_message)
 	php_http_message_object_handlers.free_obj = php_http_message_object_free;
 	php_http_message_object_handlers.read_property = php_http_message_object_read_prop;
 	php_http_message_object_handlers.write_property = php_http_message_object_write_prop;
-	php_http_message_object_handlers.get_properties = php_http_message_object_get_props;
+	php_http_message_object_handlers.get_debug_info = php_http_message_object_get_debug_info;
 	php_http_message_object_handlers.get_property_ptr_ptr = NULL;
 
 	zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);