archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix memory leaks in cURL.

Browse source 
cURL doesn't free strings we pass to him, so let PHP do it.
This commit is contained in:
Stanislav Malyshev 2000-11-22 15:46:13 +00:00
parent e7aff0b676
commit b36afe2957
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/curl/curl.c
View file

@ -267,6 +267,9 @@ PHP_MSHUTDOWN_FUNCTION(curl)
return SUCCESS;
}
static void curl_free_string(void **string) {
efree(*string);
}
/* {{{ proto string curl_version(void)
Return the CURL version string. */
@ -296,6 +299,8 @@ PHP_FUNCTION(curl_init)
}
memset(curl_handle, 0, sizeof(php_curl));
zend_llist_init(&curl_handle->to_free,sizeof(char *),curl_free_string,0);
curl_handle->cp = curl_easy_init();
if (!curl_handle->cp) {
php_error(E_ERROR, "Cannot initialize CURL Handle");
@ -308,6 +313,7 @@ PHP_FUNCTION(curl_init)
urlstr = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url));
curl_easy_setopt(curl_handle->cp, CURLOPT_URL, urlstr);
zend_llist_add_element(&curl_handle->to_free,&urlstr);
}
curl_easy_setopt(curl_handle->cp, CURLOPT_NOPROGRESS, 1);
@ -375,6 +381,7 @@ PHP_FUNCTION(curl_setopt)
copystr = estrndup(Z_STRVAL_PP(curl_value), Z_STRLEN_PP(curl_value));
ret = curl_easy_setopt(curl_handle->cp, option, copystr);
zend_llist_add_element(&curl_handle->to_free,&copystr);
}
break;
@ -793,6 +800,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc)
{
php_curl *curl_handle = (php_curl *)rsrc->ptr;
curl_easy_cleanup(curl_handle->cp);
zend_llist_clean(&curl_handle->to_free);
efree(curl_handle);
}
/* }}} */

1
ext/curl/php_curl.h
View file

@ -56,6 +56,7 @@ typedef struct {
int cerrno;
char error[CURL_ERROR_SIZE+1];
CURL *cp;
zend_llist to_free;
} php_curl;
typedef struct {