From: Xinchen Hui Date: Mon, 3 Mar 2014 08:13:03 +0000 (+0800) Subject: Fixed memory leak X-Git-Tag: POST_PHPNG_MERGE~412^2~448 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ca824d6731cbbdf9414e10a61de5dc59d51cb96;p=php Fixed memory leak --- diff --git a/ext/standard/url.c b/ext/standard/url.c index 1c02a1c437..33b70569ae 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -654,19 +654,19 @@ PHP_FUNCTION(rawurlencode) Decodes URL-encodes string */ PHP_FUNCTION(rawurldecode) { - char *in_str, *out_str; - int in_str_len, out_str_len; + char *in_str; + int in_str_len; + zend_string *out_str; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &in_str, &in_str_len) == FAILURE) { return; } - out_str = estrndup(in_str, in_str_len); - out_str_len = php_raw_url_decode(out_str, in_str_len); + out_str = STR_INIT(in_str, in_str_len, 0); + out_str->len = php_raw_url_decode(out_str->val, out_str->len); -//??? RETURN_STRINGL(out_str, out_str_len, 0); - RETURN_STRINGL(out_str, out_str_len); + RETURN_STR(out_str); } /* }}} */