Changeset 320 for trunk/src

Timestamp:

Mar 15, 2011, 8:59:48 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #237: Potential deadlock in sh_hash_hashdelete()

File:

• trunk/src/sh_hash.c (modified) (2 diffs)

trunk/src/sh_hash.c

@@ -1554 +1554 @@
 
   SL_ENTER(_("sh_hash_hashdelete"));
-  SH_MUTEX_LOCK(mutex_hash);
+
+  /* need deadlock detection here if called from exit handler 
+   */
+  SH_MUTEX_TRYLOCK(mutex_hash);
 
   if (IsInit == 0) 
@@ -1570 +1573 @@
   ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
+
   SL_RET0(_("sh_hash_hashdelete"));
 }