Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_cookie.c

diff --git a/php_http_cookie.c b/php_http_cookie.c
index 706fc10fe2d41a1b12334d9f9c4618337b97f9e0..ff67b1c1d2c6ed2a189f2e18647b9db196ac53b2 100644 (file)
--- a/php_http_cookie.c
+++ b/php_http_cookie.c
@@ -382,7 +382,7 @@ php_http_cookie_object_t *php_http_cookie_object_new_ex(zend_class_entry *ce, ph
                ce = php_http_cookie_class_entry;
        }
 
-       o = ecalloc(sizeof(*o) + sizeof(zval) * (ce->default_properties_count - 1), 1);
+       o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
        zend_object_std_init(&o->zo, ce);
        object_properties_init(&o->zo, ce);
        o->zo.handlers = &php_http_cookie_object_handlers;