Skip to content

fix missing error check in curl_multi_init() #13157

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
wants to merge 4 commits into from
Closed

fix missing error check in curl_multi_init() #13157

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4ebe14
fix missing error check in curl_multi_init()
divinity76 Jan 15, 2024
42afc2d
UNEXPECTED
divinity76 Jan 15, 2024
935c4c9
throw instead of false
divinity76 Jan 15, 2024
8b2d9a3
error message nitpick
divinity76 Jan 15, 2024
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
9 changes: 7 additions & 2 deletions ext/curl/multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,17 @@ static inline php_curlm *curl_multi_from_obj(zend_object *obj) {
PHP_FUNCTION(curl_multi_init)
{
php_curlm *mh;
CURLM *multi;

ZEND_PARSE_PARAMETERS_NONE();

multi = curl_multi_init();
if(UNEXPECTED(multi == NULL)) {
zend_throw_error(NULL, "Could not initialize a new cURL multi handle");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this should be an error or exception, looking at interface.c these kinds of failures throw an exception with a wording like "Failed to ..." (see interface.c)
Anyway, I'll let @adoy have the final say as he maintains ext/curl.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made the error message more interface.c-like

RETURN_THROWS();
}
object_init_ex(return_value, curl_multi_ce);
mh = Z_CURL_MULTI_P(return_value);
mh->multi = curl_multi_init();
mh->multi = multi;

zend_llist_init(&mh->easyh, sizeof(zval), _php_curl_multi_cleanup_list, 0);
}
Expand Down