fix read_property handler (return_value lives on stack of zend_read_property)
[m6w6/ext-http] / php_http_message.c
index ff228c77f6520d5e1d8f3681576de051ef813b66..f391d5fd989019a71c962aa80b18dbb265fcfc43 100644 (file)
@@ -20,7 +20,7 @@ zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable
 
        /* advance message */
        if (!old || old->type || zend_hash_num_elements(&old->hdrs)) {
-               (*message) = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
+               (*message) = php_http_message_init(NULL, 0, NULL);
                (*message)->parent = old;
                if (headers) {
                        (*headers) = &((*message)->hdrs);
@@ -859,15 +859,18 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t
 
        PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
+       /* supplied retun_value lives on the stack of zend_read_property! */
+       return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, return_value);
+
        if ((handler = php_http_message_object_get_prophandler(member_name))) {
+               zval_dtor(return_value);
+
                if (type == BP_VAR_R) {
                        handler->read(obj, return_value);
                } else {
                        php_property_proxy_t *proxy = php_property_proxy_init(object, member_name);
                        RETVAL_OBJ(&php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy)->zo);
                }
-       } else {
-               zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, return_value);
        }
 
        zend_string_release(member_name);
@@ -1434,7 +1437,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessage, setResponseStatus)
 {
        char *status;
-       int status_len;
+       size_t status_len;
        php_http_message_object_t *obj;
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len), invalid_arg, return);