From 4f920122a2c798e6e4c2e5bbfca44e1d13ad74d9 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 30 Dec 2024 10:06:24 +0100
Subject: [PATCH] test3105: verify multi_remove_handle done twice

It should be ok.

Ref: #15852
Closes #15860
---
 tests/data/Makefile.am     |  2 +-
 tests/data/test3105        | 30 +++++++++++++++++
 tests/libtest/Makefile.inc |  4 ++-
 tests/libtest/lib3105.c    | 67 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/test3105
 create mode 100644 tests/libtest/lib3105.c

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b012848ca3..9ec101a7c7 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -269,7 +269,7 @@ test3008 test3009 test3010 test3011 test3012 test3013 test3014 test3015 \
 test3016 test3017 test3018 test3019 test3020 test3021 test3022 test3023 \
 test3024 test3025 test3026 test3027 test3028 test3029 test3030 test3031 \
 \
-test3100 test3101 test3102 test3103 test3104 \
+test3100 test3101 test3102 test3103 test3104 test3105 \
 test3200 \
 test3201 test3202 test3203 test3204 test3205 test3207
 
diff --git a/tests/data/test3105 b/tests/data/test3105
new file mode 100644
index 0000000000..c06caa6477
--- /dev/null
+++ b/tests/data/test3105
@@ -0,0 +1,30 @@
+<testcase>
+<info>
+<keywords>
+curl_multi_remove_handle
+</keywords>
+</info>
+
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<tool>
+lib%TESTNUMBER
+</tool>
+<name>
+curl_multi_remove_handle twice
+</name>
+<command>
+-
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+</verify>
+</testcase>
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 174c7a8da6..286f3d6ba3 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -75,7 +75,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
  lib2402 lib2404 lib2405 \
  lib2502 \
  lib3010 lib3025 lib3026 lib3027 \
- lib3100 lib3101 lib3102 lib3103 lib3104 lib3207
+ lib3100 lib3101 lib3102 lib3103 lib3104 lib3105 lib3207
 
 libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 libntlmconnect_LDADD = $(TESTUTIL_LIBS)
@@ -720,5 +720,7 @@ lib3103_LDADD = $(TESTUTIL_LIBS)
 
 lib3104_SOURCES = lib3104.c $(SUPPORTFILES)
 
+lib3105_SOURCES = lib3105.c $(SUPPORTFILES)
+
 lib3207_SOURCES = lib3207.c $(SUPPORTFILES) $(TESTUTIL) $(THREADS) $(WARNLESS) $(MULTIBYTE)
 lib3207_LDADD = $(TESTUTIL_LIBS)
diff --git a/tests/libtest/lib3105.c b/tests/libtest/lib3105.c
new file mode 100644
index 0000000000..179db36eec
--- /dev/null
+++ b/tests/libtest/lib3105.c
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * SPDX-License-Identifier: curl
+ *
+ ***************************************************************************/
+#include "test.h"
+
+#include "testutil.h"
+#include "warnless.h"
+#include "memdebug.h"
+
+#define TEST_HANG_TIMEOUT 60 * 1000
+
+CURLcode test(char *URL)
+{
+  CURL *curls = NULL;
+  CURLM *multi = NULL;
+  CURLcode i = CURLE_OK;
+  CURLcode res = CURLE_OK;
+  CURLMcode mc;
+
+  global_init(CURL_GLOBAL_ALL);
+
+  multi_init(multi);
+
+  easy_init(curls);
+
+  easy_setopt(curls, CURLOPT_URL, URL);
+
+  multi_add_handle(multi, curls);
+
+  mc = curl_multi_remove_handle(multi, curls);
+  mc += curl_multi_remove_handle(multi, curls);
+
+  if(mc) {
+    fprintf(stderr, "%d was unexpected\n", (int)mc);
+    i = CURLE_FAILED_INIT;
+  }
+
+test_cleanup:
+  curl_multi_cleanup(multi);
+  curl_easy_cleanup(curls);
+  curl_global_cleanup();
+
+  if(res)
+    i = res;
+
+  return i; /* return the final return code */
+}