X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message_body.c;h=1c540c77389dba84e58b1040128ae040579cfec8;hb=8eee486472a8905b8964b08db05b22982fc63914;hp=500448936c7d2a9c3078a18df3e0ce9ce887122b;hpb=b2773ab559878238bd024c4bbebe5825cc38ad85;p=m6w6%2Fext-http

diff --git a/php_http_message_body.c b/php_http_message_body.c
index 5004489..1c540c7 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -45,14 +45,13 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo
 	body->refcount = 1;
 
 	if (stream) {
-		php_stream_auto_cleanup(stream);
 		body->res = stream->res;
 		++GC_REFCOUNT(body->res);
 	} else {
 		stream = php_stream_temp_create(TEMP_STREAM_DEFAULT, 0xffff);
-		php_stream_auto_cleanup(stream);
 		body->res = stream->res;
 	}
+	php_stream_auto_cleanup(stream);
 
 	if (body_ptr) {
 		*body_ptr = body;
@@ -555,7 +554,7 @@ php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_e
 {
 	php_http_message_body_object_t *o;
 
-	o = ecalloc(1, sizeof(php_http_message_body_object_t) + (ce->default_properties_count - 1) * sizeof(zval));
+	o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
 	zend_object_std_init(&o->zo, php_http_message_body_class_entry);
 	object_properties_init(&o->zo, ce);