From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 19 Oct 2011 03:26:00 +0000 (-0400)
Subject: Fix bug in g_static_rec_mutex_unlock_full()
X-Git-Tag: 2.31.0~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99f0eaa4c5a86f6fa721044bb6841f6bda4c689b;p=platform%2Fupstream%2Fglib.git

Fix bug in g_static_rec_mutex_unlock_full()

pthreads doesn't implement the _lock_full() and _unlock_full() calls on
recursive mutexes so we don't have it on GRecMutex either.  Now that
we're using GRecMutex to implement GStaticRecMutex, we have to fake it
by keeping an internal counter of the number of locks and calling
g_rec_mutex_unlock() the appropriate number of times.

The code to do this looked like:

  depth = mutex->depth;
  while (mutex->depth--)
    g_rec_mutex_unlock (rm);
  return depth;

which unfortunately did one last decrement after mutex->depth was
already zero (leaving it equal to -1).

When locked the next time, the count would then increase from -1 to 0
and then the next _unlock_full() call would not do any calls to
g_rec_mutex_unlock(), leading to a deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=661914
---

diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index cb685e3..b53dfce 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -806,8 +806,11 @@ g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex)
 
   rm = g_static_rec_mutex_get_rec_mutex_impl (mutex);
   depth = mutex->depth;
-  while (mutex->depth--)
-    g_rec_mutex_unlock (rm);
+  while (mutex->depth)
+    {
+      mutex->depth--;
+      g_rec_mutex_unlock (rm);
+    }
 
   return depth;
 }