Fix segfault crash after stopMonitoring on Linux (#162)

Fix #57 Co-authored-by: Matt Bernhard <[email protected]> (@umbernhard) Co-authored-by: Dimitri Witkowski <[email protected]> (@antelle) Co-authored-by: Julian Waller <[email protected]> (@Julusian) Co-authored-by: Eric Eastwood <[email protected]> (@MadLittleMods)
MadLittleMods · Mar 2, 2022 · e0840b7 · e0840b7
1 parent 6e1aefd
commit e0840b7
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/detection_linux.cpp b/src/detection_linux.cpp
@@ -90,15 +90,6 @@ void Stop() {
 	}
 
 	isRunning = false;
-
-	uv_mutex_destroy(&notify_mutex);
-	uv_signal_stop(&int_signal);
-	uv_signal_stop(&term_signal);
-	uv_close((uv_handle_t *) &async_handler, NULL);
-	uv_cond_destroy(&notifyDeviceHandled);
-
-	udev_monitor_unref(mon);
-	udev_unref(udev);
 }
 
 void InitDetection() {
@@ -241,6 +232,15 @@ static void cbWork(uv_work_t *req) {
 			udev_device_unref(dev);
 		}
 	}
+
+	// After the loop stops running, clean up all of our references and close gracefully
+	udev_monitor_unref(mon);
+	udev_unref(udev);
+	uv_mutex_destroy(&notify_mutex);
+	uv_signal_stop(&int_signal);
+	uv_signal_stop(&term_signal);
+	uv_close((uv_handle_t *) &async_handler, NULL);
+	uv_cond_destroy(&notifyDeviceHandled);
 }
 
 static void cbAfter(uv_work_t *req, int status) {