Skip to content

Use emalloc and friends in curl #11231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iluuu1994 wants to merge 2 commits into from
Closed

Use emalloc and friends in curl #11231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f6a7a
Use emalloc and friends in curl
iluuu1994 May 11, 2023
49bce14
Testing
iluuu1994 May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,28 @@ PHP_MINFO_FUNCTION(curl)
}
/* }}} */

static void *zend_curl_malloc(size_t size) {
return emalloc(size);
}

static void zend_curl_free(void *ptr) {
if (ptr) {
efree(ptr);
}
}

static void *zend_curl_realloc(void *ptr, size_t size) {
return erealloc(ptr, size);
}

static char *zend_curl_strdup(const char *s) {
return estrdup(s);
}

static void *zend_curl_calloc(size_t nmemb, size_t size) {
return ecalloc(nmemb, size);
}

/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(curl)
{
Expand All @@ -403,7 +425,7 @@ PHP_MINIT_FUNCTION(curl)
}
#endif

if (curl_global_init(CURL_GLOBAL_DEFAULT) != CURLE_OK) {
if (curl_global_init_mem(CURL_GLOBAL_DEFAULT, zend_curl_malloc, zend_curl_free, zend_curl_realloc, zend_curl_strdup, zend_curl_calloc) != CURLE_OK) {
return FAILURE;
}

Expand Down
5 changes: 4 additions & 1 deletion ext/curl/tests/bug45161.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ for ($i = 0; $i < 100; $i++) {
*/

// Start actual test
$start = memory_get_usage() + 1024;
for($i = 0; $i < 1024; $i++) {
curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc");
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_exec($ch);

if ($i === 0) {
$start = memory_get_usage();
}
}
if ($start < memory_get_usage()) {
echo 'FAIL';
Expand Down