From: Michael Jerris <mike@jerris.com>
Date: Mon, 26 Apr 2010 07:11:25 +0000 (-0400)
Subject: libdingaling: fix race on shutdown causing crash (FSMOD-47)
X-Git-Tag: git2svn-syncpoint-master~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ddd0c25a6c1ab48fda1cd4d1ba2ea0615f7e38f;p=thirdparty%2Ffreeswitch.git

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

diff --git a/libs/libdingaling/src/libdingaling.c b/libs/libdingaling/src/libdingaling.c
index 1bebebddf5..353dd139ab 100644
--- a/libs/libdingaling/src/libdingaling.c
+++ b/libs/libdingaling/src/libdingaling.c
@@ -2179,7 +2179,11 @@ ldl_status ldl_session_get_payloads(ldl_session_t *session, ldl_payload_t **payl
 
 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;
 }