Revision
17393
Author
mike
Date
2010-04-26 02:11:35 -0500 (Mon, 26 Apr 2010)

Log Message

libdingaling: fix race on shutdown causing crash (FSMOD-47)

Modified Paths

Diff

Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c (17392 => 17393)


--- freeswitch/trunk/libs/libdingaling/src/libdingaling.c	2010-04-26 06:59:48 UTC (rev 17392)
+++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c	2010-04-26 07:11:35 UTC (rev 17393)
@@ -2179,7 +2179,11 @@
 
 ldl_status ldl_global_terminate(void)
 {
-	ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
+	if (globals.flag_mutex) {
+		ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
+	} else {
+		ldl_clear_flag((&globals), LDL_FLAG_READY);
+	}
 	return LDL_STATUS_SUCCESS;
 }