mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: fix free vs. curl_free
This commit is contained in:
commit
9a85dca7a5
@ -3490,7 +3490,7 @@ PHP_FUNCTION(curl_escape)
|
||||
|
||||
if ((res = curl_easy_escape(ch->cp, str, str_len))) {
|
||||
RETVAL_STRING(res, 1);
|
||||
free(res);
|
||||
curl_free(res);
|
||||
} else {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@ -3514,7 +3514,7 @@ PHP_FUNCTION(curl_unescape)
|
||||
|
||||
if ((out = curl_easy_unescape(ch->cp, str, str_len, &out_len))) {
|
||||
RETVAL_STRINGL(out, out_len, 1);
|
||||
free(out);
|
||||
curl_free(out);
|
||||
} else {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user