- fix addRawPostData corruption

[m6w6/ext-http] / http_request_object.c

diff --git a/http_request_object.c b/http_request_object.c
index 1026317a6354a19e7234d30f765e3d153b371b5b..6b0d6b076bcefdb1db4504a07c7fd3d3e09085c6 100644 (file)
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -1190,7 +1190,7 @@ PHP_METHOD(HttpRequest, setPostFields)
        zval *post, *post_data = NULL;
        getObject(http_request_object, obj);
 
-       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!", &post_data)) {
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) {
                RETURN_FALSE;
        }
 
@@ -1276,14 +1276,18 @@ PHP_METHOD(HttpRequest, addRawPostData)
        }
        
        if (data_len) {
-               zval *zdata = GET_PROP(obj, rawPostData);
+               zval *data, *zdata = GET_PROP(obj, rawPostData);
                
-               SEPARATE_ZVAL(&zdata);
-               convert_to_string(zdata);
-               Z_STRVAL_P(zdata) = erealloc(Z_STRVAL_P(zdata), (Z_STRLEN_P(zdata) += data_len) + 1);
-               Z_STRVAL_P(zdata)[Z_STRLEN_P(zdata)] = '\0';
-               memcpy(Z_STRVAL_P(zdata) + Z_STRLEN_P(zdata) - data_len, raw_data, data_len);
-               SET_PROP(obj, rawPostData, zdata);
+               ALLOC_ZVAL(data);
+               *data = *zdata;
+               zval_copy_ctor(data);
+               INIT_PZVAL(data);
+               convert_to_string(data);
+               Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1);
+               Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0';
+               memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len);
+               SET_PROP(obj, rawPostData, data);
+               zval_ptr_dtor(&data);
        }
        
        RETURN_TRUE;