From: Antoine Cellerier <antoine@macbook.(none)>
Date: Sun, 20 Dec 2009 14:06:22 +0000 (+0100)
Subject: Fix mutex cancellation.
X-Git-Tag: 1.1.0-ff~1806
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b601fe0adff74d9497d6a6150bc6a8f96854e63a;p=vlc

Fix mutex cancellation.
---

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index e5a1f02aa1..e92da8cb32 100644
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -181,9 +181,10 @@ static int vlclua_lock_and_wait( lua_State *L )
     intf_sys_t *p_sys = p_intf->p_sys;
 
     vlc_mutex_lock( &p_sys->lock );
+    mutex_cleanup_push( &p_sys->lock );
     while( !p_sys->exiting )
         vlc_cond_wait( &p_sys->wait, &p_sys->lock );
-    vlc_mutex_unlock( &p_sys->lock );
+    vlc_cleanup_pop();
     lua_pushboolean( L, 1 );
     return 1;
 }