[vlc-devel] commit: Fix the same race condition as in ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed May 7 22:18:02 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Wed May  7 23:15:46 2008 +0300| [ef33cb40a80a612b7ac8f3eb0f05e2b6cbec945c]

Fix the same race condition as in
[19bd84c786fecb77531073b697aad4d3c221d15d]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef33cb40a80a612b7ac8f3eb0f05e2b6cbec945c
---

 src/misc/objects.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 1f0193e..1f0f73c 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -722,8 +722,8 @@ void * vlc_object_get( int i_id )
         else
         {
             vlc_object_yield( pp_objects[i_middle] );
-            vlc_mutex_unlock( &structure_lock );
-            return pp_objects[i_middle];
+            obj = pp_objects[i_middle];
+            break;
         }
     }
 




More information about the vlc-devel mailing list