X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message_parser.c;h=2438fc13e31aaa427a88d0e21403e565c7568d2c;hb=16ecea28f2bbcf20d69dedc6611a959923720656;hp=64ab436c3cc66d1629d1e3f02a83e11ae2416d2f;hpb=7096ff6dbb61fd13b9b04ef86bfbece8fb4b2ea0;p=m6w6%2Fext-http

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 64ab436..2438fc1 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -250,13 +250,16 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 				zval h, *h_loc = NULL, *h_con = NULL, *h_cl, *h_cr, *h_te, *h_ce;
 
 				if ((h_te = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding")))) {
+					Z_TRY_ADDREF_P(h_te);
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), h_te);
 					zend_hash_str_del(&(*message)->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding"));
 				}
 				if ((h_cl = php_http_message_header(*message, ZEND_STRL("Content-Length")))) {
+					Z_TRY_ADDREF_P(h_cl);
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), h_cl);
 				}
 				if ((h_cr = php_http_message_header(*message, ZEND_STRL("Content-Range")))) {
+					Z_TRY_ADDREF_P(h_cr);
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Range", sizeof("X-Original-Content-Range"), h_cr);
 					zend_hash_str_del(&(*message)->hdrs, "Content-Range", lenof("Content-Range"));
 				}
@@ -298,10 +301,9 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 						} else {
 							parser->inflate = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), 0);
 						}
+						Z_TRY_ADDREF_P(h_ce);
 						zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), h_ce);
 						zend_hash_str_del(&(*message)->hdrs, "Content-Encoding", lenof("Content-Encoding"));
-					} else {
-						zval_ptr_dtor(h_ce);
 					}
 				}
 
@@ -630,7 +632,7 @@ PHP_MINIT_FUNCTION(http_message_parser)
 	memcpy(&php_http_message_parser_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_parser_class_entry->create_object = php_http_message_parser_object_new;
 	php_http_message_parser_object_handlers.clone_obj = NULL;
-	php_http_message_parser_object_handlers.dtor_obj = php_http_message_parser_object_free;
+	php_http_message_parser_object_handlers.free_obj = php_http_message_parser_object_free;
 	php_http_message_parser_object_handlers.offset = XtOffsetOf(php_http_message_parser_object_t, zo);
 
 	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP);