Commit b462123a authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix resource deadlock in OSDmenu code.

parent 953122c1
...@@ -270,8 +270,6 @@ static int CreateFilter ( vlc_object_t *p_this ) ...@@ -270,8 +270,6 @@ static int CreateFilter ( vlc_object_t *p_this )
error: error:
msg_Err( p_filter, "osdmenu filter discarded" ); msg_Err( p_filter, "osdmenu filter discarded" );
osd_MenuDelete( p_this, p_sys->p_menu );
p_sys->p_menu = NULL;
free( p_sys->psz_path ); free( p_sys->psz_path );
free( p_sys->psz_file ); free( p_sys->psz_file );
free( p_sys ); free( p_sys );
......
...@@ -68,7 +68,6 @@ static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file ) ...@@ -68,7 +68,6 @@ static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file )
if( !p_menu->p_image || !p_menu->psz_file ) if( !p_menu->p_image || !p_menu->psz_file )
{ {
msg_Err( p_menu, "unable to load images, aborting .." ); msg_Err( p_menu, "unable to load images, aborting .." );
osd_ParserUnload( p_menu );
return true; return true;
} }
else else
...@@ -85,7 +84,6 @@ static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file ) ...@@ -85,7 +84,6 @@ static bool osd_ParserLoad( osd_menu_t *p_menu, const char *psz_file )
psz_type, true ); psz_type, true );
if( !p_menu->p_parser ) if( !p_menu->p_parser )
{ {
osd_ParserUnload( p_menu );
return false; return false;
} }
} }
...@@ -200,6 +198,7 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -200,6 +198,7 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
return p_osd; return p_osd;
error: error:
vlc_mutex_unlock( lockval.p_address );
__osd_MenuDelete( p_this, p_osd ); __osd_MenuDelete( p_this, p_osd );
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment