File tree 2 files changed +10
-2
lines changed 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 6
6
. Fixed timer leak in zend-max-execution-timers builds. (withinboredom)
7
7
. Fixed bug GH-12349 (linking failure on ARM with mold). (Jan Palus)
8
8
9
+ - Curl:
10
+ . Fix missing error check in curl_multi_init(). (divinity76)
11
+
9
12
- FPM:
10
13
. Fixed bug GH-12996 (Incorrect SCRIPT_NAME with Apache ProxyPassMatch when
11
14
plus in path). (Jakub Zelenka)
Original file line number Diff line number Diff line change @@ -60,12 +60,17 @@ static inline php_curlm *curl_multi_from_obj(zend_object *obj) {
60
60
PHP_FUNCTION (curl_multi_init )
61
61
{
62
62
php_curlm * mh ;
63
+ CURLM * multi ;
63
64
64
65
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
+ }
66
71
object_init_ex (return_value , curl_multi_ce );
67
72
mh = Z_CURL_MULTI_P (return_value );
68
- mh -> multi = curl_multi_init () ;
73
+ mh -> multi = multi ;
69
74
70
75
zend_llist_init (& mh -> easyh , sizeof (zval ), _php_curl_multi_cleanup_list , 0 );
71
76
}
You can’t perform that action at this time.
0 commit comments