mirror of
https://github.com/php/php-src.git
synced 2025-08-16 22:18:50 +02:00
Merge branch 'PHP-5.5'
* PHP-5.5: fix free vs. curl_free
This commit is contained in:
commit
9a85dca7a5
1 changed files with 2 additions and 2 deletions
|
@ -3490,7 +3490,7 @@ PHP_FUNCTION(curl_escape)
|
||||||
|
|
||||||
if ((res = curl_easy_escape(ch->cp, str, str_len))) {
|
if ((res = curl_easy_escape(ch->cp, str, str_len))) {
|
||||||
RETVAL_STRING(res, 1);
|
RETVAL_STRING(res, 1);
|
||||||
free(res);
|
curl_free(res);
|
||||||
} else {
|
} else {
|
||||||
RETURN_FALSE;
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -3514,7 +3514,7 @@ PHP_FUNCTION(curl_unescape)
|
||||||
|
|
||||||
if ((out = curl_easy_unescape(ch->cp, str, str_len, &out_len))) {
|
if ((out = curl_easy_unescape(ch->cp, str, str_len, &out_len))) {
|
||||||
RETVAL_STRINGL(out, out_len, 1);
|
RETVAL_STRINGL(out, out_len, 1);
|
||||||
free(out);
|
curl_free(out);
|
||||||
} else {
|
} else {
|
||||||
RETURN_FALSE;
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue