From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 24 Aug 2009 19:39:20 +0000 (+0300)
Subject: module_need: handle module loading error
X-Git-Tag: 1.1.0-ff~3957
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b9513f3c7038dbc09cdc4432e70354051272fa66;p=vlc

module_need: handle module loading error
---

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 972d23effa..cadfd6235c 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -560,11 +560,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