diff options
| author | Anatol Belski <ab@php.net> | 2013-02-17 20:29:58 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-02-17 20:29:58 +0100 |
| commit | 9a85dca7a566cef6bee9f07dbf9c6059dabb135c (patch) | |
| tree | af0a2cf4678fea3f4e404bb31aa2b49c528bbc86 /ext/curl | |
| parent | 8be9a974dac0c95eed50e123e5aaeee78e497974 (diff) | |
| parent | 432d59ab5560202a46b01d05455418e9fc810365 (diff) | |
| download | php-git-9a85dca7a566cef6bee9f07dbf9c6059dabb135c.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
fix free vs. curl_free
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ab9e12cd96..5bd1b479e2 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -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; } |