[vlc-devel] commit: module_need: handle module loading error ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Aug 24 22:11:13 CEST 2009
vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 24 22:39:20 2009 +0300| [16735eb02ac349a9aff8ec94bb6412ded1b7dcf3] | committer: Rémi Denis-Courmont
module_need: handle module loading error
(cherry picked from commit b9513f3c7038dbc09cdc4432e70354051272fa66)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16735eb02ac349a9aff8ec94bb6412ded1b7dcf3
---
src/modules/modules.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 40a2c93..65ba948 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -565,11 +565,14 @@ found_shortcut:
{
module_t *p_new_module =
AllocatePlugin( p_this, p_real->psz_filename );
- if( p_new_module )
- {
- CacheMerge( p_this, p_real, p_new_module );
- DeleteModule( p_module_bank, p_new_module );
+ if( p_new_module == NULL )
+ { /* Corrupted module */
+ msg_Err( p_this, "possibly corrupt module cache" );
+ module_release( p_cand );
+ continue;
}
+ CacheMerge( p_this, p_real, p_new_module );
+ DeleteModule( p_module_bank, p_new_module );
}
#endif
More information about the vlc-devel
mailing list