From a9b0ddd7803f4c32cc0389426318aa22bd34ac06 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Tue, 26 Jul 2011 12:20:41 +0200
Subject: Experimentally added mutex lock in getMSGID in order to fix bug 275.

---
 runtime/msg.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/runtime/msg.c b/runtime/msg.c
index d1e67aa2..f5f7fee1 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1629,14 +1629,20 @@ finalize_it:
 }
 
 
-/* rgerhards, 2005-11-24
+/* al, 2011-07-26: LockMsg to avoid race conditions
  */
 static inline char *getMSGID(msg_t *pM)
 {
-	return (pM->pCSMSGID == NULL) ? "-" : (char*) rsCStrGetSzStrNoNULL(pM->pCSMSGID);
+	if (pM->pCSMSGID == NULL) {
+		return "-"; 
+	}
+	else {
+		MsgLock(pM);
+		return (char*) rsCStrGetSzStrNoNULL(pM->pCSMSGID);
+		MsgUnlock(pM);
+	}
 }
 
-
 /* rgerhards 2009-06-12: set associated ruleset
  */
 void MsgSetRuleset(msg_t *pMsg, ruleset_t *pRuleset)
-- 
cgit v1.2.3