Fix FS#12278 - saving a full .cfg file would crash

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30553 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 9 insertions, 1 deletions

diff --git a/apps/settings_list.c b/apps/settings_list.c
index 27726dd..2f452e6 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -429,6 +429,8 @@ static int find_setting_by_name(char*name)
 {
     int i = 0;
     const struct settings_list *setting;
+    if (!strcmp(name, "-"))
+        return -1;
     while (i<nb_settings)
     {
         setting = &settings[i];
@@ -446,7 +448,13 @@ static void qs_load_from_cfg(void* var, char*value)
 }
 static char* qs_write_to_cfg(void* setting, char*buf, int buf_len)
 {
-    const struct settings_list *var = &settings[*(int*)setting];
+    int index = *(int*)setting;
+    if (index < 0 || index >= nb_settings - 1)
+    {
+        strlcpy(buf, "-", buf_len);
+        return buf;
+    }
+    const struct settings_list *var = &settings[index];
     strlcpy(buf, var->cfg_name, buf_len);
     return buf;
 }