Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_encoding.c

diff --git a/php_http_encoding.c b/php_http_encoding.c
index 1ef355e817d1e4ce75b379b65b496ed9567ebb2b..ffa10b379a2467f0222141cc6d2b38694df6efd4 100644 (file)
--- a/php_http_encoding.c
+++ b/php_http_encoding.c
@@ -909,7 +909,7 @@ php_http_encoding_stream_object_t *php_http_encoding_stream_object_new_ex(zend_c
 {
        php_http_encoding_stream_object_t *o;
 
-       o = ecalloc(1, sizeof(*o) + (ce->default_properties_count - 1) * sizeof(zval));
+       o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
        zend_object_std_init(&o->zo, ce);
        object_properties_init(&o->zo, ce);