Skip to content

Commit 83c8d02

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix missing error check in curl_multi_init()
2 parents f234104 + 9814d4a commit 83c8d02

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ PHP NEWS
66
. Fixed timer leak in zend-max-execution-timers builds. (withinboredom)
77
. Fixed bug GH-12349 (linking failure on ARM with mold). (Jan Palus)
88

9+
- Curl:
10+
. Fix missing error check in curl_multi_init(). (divinity76)
11+
912
- FPM:
1013
. Fixed bug GH-12996 (Incorrect SCRIPT_NAME with Apache ProxyPassMatch when
1114
plus in path). (Jakub Zelenka)

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)