Skip to content

Commit 92d53c8

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix missing error check in curl_multi_init()
2 parents c334de8 + 83c8d02 commit 92d53c8

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

ext/curl/multi.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,17 @@ static inline php_curlm *curl_multi_from_obj(zend_object *obj) {
6060
PHP_FUNCTION(curl_multi_init)
6161
{
6262
php_curlm *mh;
63+
CURLM *multi;
6364

6465
ZEND_PARSE_PARAMETERS_NONE();
65-
66+
multi = curl_multi_init();
67+
if (UNEXPECTED(multi == NULL)) {
68+
zend_throw_error(NULL, "%s(): Could not initialize a new cURL multi handle", get_active_function_name());
69+
RETURN_THROWS();
70+
}
6671
object_init_ex(return_value, curl_multi_ce);
6772
mh = Z_CURL_MULTI_P(return_value);
68-
mh->multi = curl_multi_init();
73+
mh->multi = multi;
6974

7075
zend_llist_init(&mh->easyh, sizeof(zval), _php_curl_multi_cleanup_list, 0);
7176
}

0 commit comments

Comments
 (0)