moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-10 21:48:10 -05:00
Code Issues Releases Wiki Activity

multi: Improve parameter check for curl_multi_remove_handle

Browse Source 
- If an easy handle is owned by a multi different from the one specified
  then return CURLM_BAD_EASY_HANDLE.

Prior to this change I assume user error could cause corruption.

Closes https://github.com/curl/curl/pull/5116
This commit is contained in:
Jay Satiro 2020-03-17 18:59:07 -04:00
parent 7284061361
commit a268ad5d7e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/libcurl/libcurl-errors.3
View File

@ -283,8 +283,8 @@ Things are fine.
The passed-in handle is not a valid CURLM handle. The passed-in handle is not a valid CURLM handle.
.IP "CURLM_BAD_EASY_HANDLE (2)" .IP "CURLM_BAD_EASY_HANDLE (2)"
An easy handle was not good/valid. It could mean that it isn't an easy handle An easy handle was not good/valid. It could mean that it isn't an easy handle
at all, or possibly that the handle already is in used by this or another at all, or possibly that the handle already is in use by this or another multi
multi handle. handle.
.IP "CURLM_OUT_OF_MEMORY (3)" .IP "CURLM_OUT_OF_MEMORY (3)"
You are doomed. You are doomed.
.IP "CURLM_INTERNAL_ERROR (4)" .IP "CURLM_INTERNAL_ERROR (4)"

4
lib/multi.c
View File

@ -700,6 +700,10 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
if(!data->multi) if(!data->multi)
return CURLM_OK; /* it is already removed so let's say it is fine! */ return CURLM_OK; /* it is already removed so let's say it is fine! */
/* Prevent users from trying to remove an easy handle from the wrong multi */
if(data->multi != multi)
return CURLM_BAD_EASY_HANDLE;
if(multi->in_callback) if(multi->in_callback)
return CURLM_RECURSIVE_API_CALL; return CURLM_RECURSIVE_API_CALL;