libvlc: ref_count should only be accessed in the lock.

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index eaf2b1b520543da4b893b4f375e6c29d6e0b9f4e..ececd0ea0c72a6d468e8b1b97b509d1eb526f704 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -25,6 +25,7 @@
 #include <vlc/libvlc.h>
 
 #include <vlc_interface.h>
+#include <vlc_vlm.h>
 
 #include <stdarg.h>
 #include <limits.h>
@@ -164,9 +165,8 @@ void libvlc_release( libvlc_instance_t *p_instance )
     vlc_mutex_t *lock = &p_instance->instance_lock;
     int refs;
 
-    assert( p_instance->ref_count > 0 );
-
     vlc_mutex_lock( lock );
+    assert( p_instance->ref_count > 0 );
     refs = --p_instance->ref_count;
     vlc_mutex_unlock( lock );
 
@@ -176,6 +176,8 @@ void libvlc_release( libvlc_instance_t *p_instance )
         vlc_mutex_destroy( &p_instance->event_callback_lock );
         if( p_instance->p_event_manager )
             libvlc_event_manager_release( p_instance->p_event_manager );
+        if( p_instance->p_vlm )
+            vlm_Delete( p_instance->p_vlm );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );
         free( p_instance );
@@ -213,7 +215,8 @@ const char * libvlc_get_compiler(void)
 
 const char * libvlc_get_changeset(void)
 {
-    return "exported";
+    extern const char psz_vlc_changeset[];
+    return psz_vlc_changeset;
 }
 
 /* export internal libvlc_instance for ugly hacks with libvlccore */