X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_inflatestream_object.c;h=39abcee3edbfbc74e3019c57eee5be33f881943f;hp=c54d094f86c4ab0aef69a9da6c920c19b431caa0;hb=45abbc6fd229be01e963e9642a03118d3c99131c;hpb=f0bcc141e62c022101d8d19c1d73e7b9ae41d0e9 diff --git a/http_inflatestream_object.c b/http_inflatestream_object.c index c54d094..39abcee 100644 --- a/http_inflatestream_object.c +++ b/http_inflatestream_object.c @@ -31,10 +31,6 @@ #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, ret_ref) #define HTTP_INFLATE_ME(method, visibility) PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, method), visibility) -HTTP_BEGIN_ARGS(__construct, 0, 0) - HTTP_ARG_VAL(flags, 0) -HTTP_END_ARGS; - HTTP_BEGIN_ARGS(update, 0, 1) HTTP_ARG_VAL(data, 0) HTTP_END_ARGS; @@ -171,7 +167,9 @@ PHP_METHOD(HttpInflateStream, flush) char *decoded = NULL, *data = NULL; getObject(http_inflatestream_object, obj); - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { + RETURN_FALSE; + } if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { RETURN_FALSE; @@ -220,14 +218,15 @@ PHP_METHOD(HttpInflateStream, finish) updated = erealloc(updated, updated_len + decoded_len + 1); updated[updated_len + decoded_len] = '\0'; memcpy(updated + updated_len, decoded, decoded_len); + STR_FREE(decoded); updated_len += decoded_len; RETVAL_STRINGL(updated, updated_len, 0); - STR_FREE(decoded); } else { - RETVAL_STRINGL(decoded, decoded_len, 0); STR_FREE(updated); + RETVAL_STRINGL(decoded, decoded_len, 0); } } else { + STR_FREE(updated); RETVAL_FALSE; }