Commit 47281ac2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix loading plugins still depending on unsafe config actions

parent 437c3166
...@@ -966,9 +966,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, ...@@ -966,9 +966,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
{ {
module_t * p_module = NULL; module_t * p_module = NULL;
/* /* msg_Dbg( p_this, "plugin \"%s\", %s",
* Check our plugins cache first then load plugin if needed p_module->psz_object_name, p_module->psz_longname ); */
*/ /* Check our plugins cache first then load plugin if needed */
if( mode == CACHE_USE ) if( mode == CACHE_USE )
p_module = CacheFind( p_bank, path, mtime, size ); p_module = CacheFind( p_bank, path, mtime, size );
if( p_module == NULL ) if( p_module == NULL )
...@@ -978,15 +978,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, ...@@ -978,15 +978,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
/* We have not already scanned and inserted this module */ /* We have not already scanned and inserted this module */
assert( p_module->next == NULL ); assert( p_module->next == NULL );
assert( !p_module->b_builtin );
/* msg_Dbg( p_this, "plugin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
p_module->next = p_bank->head;
p_bank->head = p_module;
assert( p_module->next != NULL ); /* Insertion done */
/* Unload plugin until we really need it */ /* Unload plugin until we really need it */
assert( !p_module->b_builtin );
if( p_module->b_loaded && p_module->b_unloadable ) if( p_module->b_loaded && p_module->b_unloadable )
{ {
module_Unload( p_module->handle ); module_Unload( p_module->handle );
...@@ -1006,6 +1000,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, ...@@ -1006,6 +1000,9 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
break; break;
} }
p_module->next = p_bank->head;
p_bank->head = p_module;
if( mode == CACHE_IGNORE ) if( mode == CACHE_IGNORE )
return 0; return 0;
......
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