luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multi: fix return code for an already-removed easy handle

Browse Source 
- Ensure that CURLM_OK is returned when curl_multi_remove_handle is
  called with an already removed easy handle.

Prior to this change and since ba235ab2 which precedes 8.10.0, if
curl_multi_remove_handle was called with an already-removed easy handle
then the return code would be CURLM_OK or CURLM_BAD_EASY_HANDLE
depending respectively on whether the multi did or did not contain other
easy handles.

This change restores the old behavior of returning CURLM_OK in both
cases.

Reported-by: Ralph Sennhauser

Fixes https://github.com/curl/curl/issues/15844
Closes https://github.com/curl/curl/pull/15852
This commit is contained in:
Jay Satiro 2024-12-28 18:47:45 -05:00
parent 6c70ec16c7
commit 713182bd19
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/multi.c
View File

@ -787,7 +787,7 @@ CURLMcode curl_multi_remove_handle(CURLM *m, CURL *d)
return CURLM_BAD_HANDLE; return CURLM_BAD_HANDLE;
/* Verify that we got a somewhat good easy handle too */ /* Verify that we got a somewhat good easy handle too */
if(!GOOD_EASY_HANDLE(data) || !multi->num_easy) if(!GOOD_EASY_HANDLE(data))
return CURLM_BAD_EASY_HANDLE; return CURLM_BAD_EASY_HANDLE;
/* Prevent users from trying to remove same easy handle more than once */ /* Prevent users from trying to remove same easy handle more than once */
@ -798,6 +798,11 @@ CURLMcode curl_multi_remove_handle(CURLM *m, CURL *d)
if(data->multi != multi) if(data->multi != multi)
return CURLM_BAD_EASY_HANDLE; return CURLM_BAD_EASY_HANDLE;
if(!multi->num_easy) {
DEBUGASSERT(0);
return CURLM_INTERNAL_ERROR;
}
if(multi->in_callback) if(multi->in_callback)
return CURLM_RECURSIVE_API_CALL; return CURLM_RECURSIVE_API_CALL;