Move ui_companion_driver code out of retroarch.c (libretro#13268)

* Move ui_companion_driver code out of retroarch.c * Buildfix * Fix error - was reading the array out of (preinitialized) bounds * Remove unused variable
jasonunbrokensoftware · Nov 21, 2021 · 113e934 · 113e934
1 parent 5f49899
commit 113e934
Show file tree

Hide file tree

Showing 6 changed files with 359 additions and 314 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -235,6 +235,7 @@ endif
 OBJ += frontend/frontend_driver.o \
        retroarch.o \
        driver.o \
+       ui/ui_companion_driver.o \
        camera/camera_driver.o \
        record/record_driver.o \
        command.o \

diff --git a/griffin/griffin.c b/griffin/griffin.c
@@ -1222,6 +1222,7 @@ RETROARCH
 #include "../driver.c"
 #include "../midi_driver.c"
 #include "../location_driver.c"
+#include "../ui/ui_companion_driver.c"
 #include "../libretro-common/queues/task_queue.c"
 
 #include "../msg_hash.c"

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
@@ -9729,7 +9729,7 @@ static bool setting_append_list(
       case SETTINGS_LIST_DRIVERS:
          {
             unsigned i, j = 0;
-            struct string_options_entry string_options_entries[12];
+            struct string_options_entry string_options_entries[12] = {0};
 
             START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS), parent_group);
             MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, MENU_ENUM_LABEL_DRIVER_SETTINGS);
@@ -9849,7 +9849,7 @@ static bool setting_append_list(
             string_options_entries[j].default_value   = config_get_default_midi();
             string_options_entries[j].values          = config_get_midi_driver_options();
 
-            for (i = 0; i < ARRAY_SIZE(string_options_entries); i++)
+            for (i = 0; i < j; i++)
             {
                CONFIG_STRING_OPTIONS(
                      list, list_info,