do not detach if it has not been created

horta · Nov 15, 2021 · 86588af · 86588af
1 parent ed8e9d5
commit 86588af
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 project(
   athr
-  VERSION 3.0.2
+  VERSION 3.0.3
   LANGUAGES C)
 set(PROJECT_DESCRIPTION "Progress indicator library written in C.")
 

diff --git a/src/athr/thr.h b/src/athr/thr.h
@@ -15,6 +15,7 @@ typedef void(athr_thr_start)(void *);
 
 struct athr_thr
 {
+    int has_been_created;
     athr_thr_handle handle;
     athr_thr_start *func;
     void *arg;

diff --git a/src/thr.c b/src/thr.c
@@ -25,19 +25,24 @@ static WRAPPER_RETURN __thr_wrapper(WRAPPER_ARG_T arg)
 
 int thr_create(struct athr_thr *thr, athr_thr_start *func, void *arg)
 {
+    thr->has_been_created = 0;
     thr->func = func;
     thr->arg = arg;
+    int rc = 0;
 
 #ifdef ATHR_WINDOWS
     thr->handle = CreateThread(NULL, 0, __thr_wrapper, (LPVOID)thr, 0, NULL);
-    return !thr->handle;
+    rc = !thr->handle;
 #else
-    return pthread_create(&thr->handle, 0, __thr_wrapper, (void *)thr);
+    rc = pthread_create(&thr->handle, 0, __thr_wrapper, (void *)thr);
 #endif
+    thr->has_been_created = !rc;
+    return rc;
 }
 
 void thr_detach(struct athr_thr *thr)
 {
+    if (!thr->has_been_created) return;
 #ifdef ATHR_WINDOWS
     CloseHandle(thr->handle);
 #else