X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message.c;h=0c5b1b9736f49c2388423d4ced29a7ccd5b379ba;hb=e250d339046895893f02b007d093c27d88a0a883;hp=b32a8226f19f889425e5fd3f4438fad3da5a7fac;hpb=03f11ce599fa5a89148d588caf6ccec7f939e9d4;p=m6w6%2Fext-http

diff --git a/php_http_message.c b/php_http_message.c
index b32a822..0c5b1b9 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -498,6 +498,11 @@ 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;
 
+static void php_http_message_object_prophandler_hash_dtor(zval *pData)
+{
+	pefree(Z_PTR_P(pData), 1);
+}
+
 typedef void (*php_http_message_object_prophandler_func_t)(php_http_message_object_t *o, zval *v);
 
 typedef struct php_http_message_object_prophandler {
@@ -1012,7 +1017,7 @@ static PHP_METHOD(HttpMessage, __construct)
 		msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy);
 
 		if (!msg && !EG(exception)) {
-			php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->len);
+			php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->val);
 		}
 		zend_string_release(zs_msg);
 	}
@@ -1954,7 +1959,7 @@ PHP_MINIT_FUNCTION(http_message)
 	memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_object_handlers.offset = XtOffsetOf(php_http_message_object_t, zo);
 	php_http_message_object_handlers.clone_obj = php_http_message_object_clone;
-	php_http_message_object_handlers.dtor_obj = php_http_message_object_free;
+	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;
@@ -1962,7 +1967,7 @@ PHP_MINIT_FUNCTION(http_message)
 
 	zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
 
-	zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1);
+	zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, php_http_message_object_prophandler_hash_dtor, 1);
 	zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED);
 	php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type);
 	zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED);