Add exit-time destructors test

Author: falbrechtskirchinger

.gitignore

@@ -16,6 +16,7 @@ test/httplib.cc
 test/httplib.h
 test/test
 test/server_fuzzer
+test/test_no_exit_time_dtors
 test/test_proxy
 test/test_split
 test/test.xcodeproj/xcuser*

test/Makefile

@@ -18,7 +18,7 @@ ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 BROTLI_DIR = $(PREFIX)/opt/brotli
 BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
 
-TEST_ARGS = gtest/src/gtest-all.cc gtest/src/gtest_main.cc -Igtest -Igtest/include $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
+TEST_ARGS = gtest_main.o gtest-all.o -Igtest -Igtest/include $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
 
 # By default, use standalone_fuzz_target_runner.
 # This runner does no fuzzing, but simply executes the inputs
@@ -33,19 +33,30 @@ REALPATH = $(shell which grealpath 2>/dev/null || which realpath 2>/dev/null)
 STYLE_CHECK_FILES = $(filter-out httplib.h httplib.cc, \
 	$(wildcard example/*.h example/*.cc fuzzing/*.h fuzzing/*.cc *.h *.cc ../httplib.h))
 
-all : test test_split
+all : test test_no_exit_time_dtors test_split
 	./test
+	GTEST_FILTER="ExitTimeDtorsTest.*" ./test_no_exit_time_dtors
 
 proxy : test_proxy
 	./test_proxy
 
-test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
+gtest-all.o : gtest/src/gtest-all.cc
+	$(CXX) -c -o $@ $(CXXFLAGS) -Igtest -Igtest/include $<
+
+gtest_main.o : gtest/src/gtest_main.cc
+	$(CXX) -c -o $@ $(CXXFLAGS) -Igtest -Igtest/include $<
+
+test : gtest_main.o gtest-all.o test.cc include_httplib.cc ../httplib.h Makefile cert.pem
 	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
 	@file $@
 
+test_no_exit_time_dtors : gtest_main.o gtest-all.o test.cc ../httplib.h Makefile cert.pem
+	$(CXX) -o $@ -I.. $(CXXFLAGS) -DCPPHTTPLIB_NO_EXIT_TIME_DESTRUCTORS \
+		$(if $(findstring clang,$(CXX)),-Wexit-time-destructors -Werror=exit-time-destructors) test.cc $(TEST_ARGS)
+
 # Note: The intention of test_split is to verify that it works to compile and
 # link the split httplib.h, so there is normally no need to execute it.
-test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
+test_split : gtest_main.o gtest-all.o test.cc ../httplib.h httplib.cc Makefile cert.pem
 	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
 
 check_abi:
@@ -73,7 +84,7 @@ style_check: $(STYLE_CHECK_FILES)
 		echo "All files are properly formatted."; \
 	fi
 
-test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem
+test_proxy : gtest_main.o gtest-all.o test_proxy.cc ../httplib.h Makefile cert.pem
 	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS)
 
 # Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE).
@@ -98,5 +109,5 @@ cert.pem:
 	./gen-certs.sh
 
 clean:
-	rm -rf test test_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc _build* *.dSYM
+	rm -rf test test_no_exit_time_dtors test_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc _build* *.dSYM
 

test/test.cc

@@ -8470,3 +8470,75 @@ TEST(ClientInThreadTest, Issue2068) {
     t.join();
   }
 }
+
+#if defined(__SANITIZE_ADDRESS__)
+#define ASAN_ENABLED 1
+#else
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
+#define ASAN_ENABLED 1
+#else
+#define ASAN_ENABLED 0
+#endif
+#else
+#define ASAN_ENABLED 0
+#endif
+#endif
+
+// No death tests on Windows
+#ifndef _WIN32
+bool KilledByAbortOrSegfault(int exit_status) {
+  return
+#if ASAN_ENABLED
+      // For ASan in some environments
+      (WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == 1) ||
+#endif
+      (WIFSIGNALED(exit_status) &&
+       (WTERMSIG(exit_status) == SIGABRT || WTERMSIG(exit_status) == SIGSEGV));
+}
+
+Server *issue2097_svr = nullptr;
+std::thread *issue2097_svr_thread = nullptr;
+
+TEST(ExitTimeDtorsTest, Issue2097) {
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
+  ASSERT_EXIT(
+      {
+        issue2097_svr = new Server();
+        std::atexit([]() {
+          // Wait a bit before stopping server to simulate delayed exit
+          std::this_thread::sleep_for(std::chrono::milliseconds(200));
+          issue2097_svr->stop();
+          issue2097_svr_thread->join();
+        });
+
+        issue2097_svr_thread = new std::thread([]() {
+          issue2097_svr->Get(
+              "/hi", [](const Request & /*req*/, httplib::Response &res) {
+                res.set_content("Quack", "text/plain");
+              });
+
+          issue2097_svr->listen(HOST, PORT);
+        });
+
+        std::thread cli_thread([]() {
+          Client cli(HOST, PORT);
+          while (true) {
+            auto res = cli.Get("/hi");
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+          }
+        });
+
+        std::thread([]() {
+          std::this_thread::sleep_for(std::chrono::milliseconds(200));
+          std::exit(42);
+        }).join();
+      },
+#ifdef CPPHTTPLIB_NO_EXIT_TIME_DESTRUCTORS
+      ::testing::ExitedWithCode(42),
+#else
+      KilledByAbortOrSegfault,
+#endif
+      "");
+}
+#endif