Fix error handling from module_list_get() (fixes #7500)

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 9031a00675358b3fe1032f232b57971318f867ad..a39e07a9ef9082ecdd76bc43937b968ec68460ee 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -535,15 +535,16 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
 
 void ModuleConfigControl::finish( bool bycat )
 {
-    module_t *p_parser;
-
     combo->setEditable( false );
 
     /* build a list of available modules */
-    module_t **p_list = module_list_get( NULL );
+    size_t count;
+    module_t **p_list = module_list_get( &count );
     combo->addItem( qtr("Default") );
-    for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
+    for( size_t i = 0; i < count; i++ )
     {
+        module_t *p_parser = p_list[i];
+
         if( bycat )
         {
             if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;
@@ -661,12 +662,13 @@ void ModuleListConfigControl::checkbox_lists( QString label, QString help, const
 
 void ModuleListConfigControl::finish( bool bycat )
 {
-    module_t *p_parser;
-
     /* build a list of available modules */
-    module_t **p_list = module_list_get( NULL );
-    for( size_t i = 0; (p_parser = p_list[i]) != NULL; i++ )
+    size_t count;
+    module_t **p_list = module_list_get( &count );
+    for( size_t i = 0; i < count; i++ )
     {
+        module_t *p_parser = p_list[i];
+
         if( bycat )
         {
             if( !strcmp( module_get_object( p_parser ), "main" ) ) continue;