module_need: handle module loading error

b9513f3c · Rémi Denis-Courmont · 5604a589 · b9513f3c
Commit b9513f3c authored Aug 24, 2009 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

src/modules/modules.c src/modules/modules.c +7 -4

No files found.
--- 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 )
+            if( p_new_module == NULL )
-            {
+            {   /* Corrupted module */
-                CacheMerge( p_this, p_real, p_new_module );
+                msg_Err( p_this, "possibly corrupt module cache" );
-                DeleteModule( p_module_bank, p_new_module );
+                module_release( p_cand );
+                continue;
            }
+            CacheMerge( p_this, p_real, p_new_module );
+            DeleteModule( p_module_bank, p_new_module );
        }
 #endif