Harddrive limit bumped to 50, check limit.

diff --git a/cfgfile.cpp b/cfgfile.cpp
index b55e4433a2c27e2627a8b73ae1674238acc23ac5..ee267e9bd06a165389faf49691d8d67be662a75a 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -4802,9 +4802,15 @@ struct uaedev_config_data *add_filesys_config (struct uae_prefs *p, int index, s
                        }
                }
                uci = getuci (p);
+               if (!uci) {
+                       return NULL;
+               }
                uci->configoffset = -1;
                uci->unitnum = -1;
        } else {
+               if (index >= MAX_FILESYSTEM_UNITS) {
+                       return NULL;
+               }
                uci = &p->mountconfig[index];
        }
        if (!uci)

diff --git a/include/filesys.h b/include/filesys.h
index f8538e805dca0421ca99cb176468b1b47ce23e18..76e5487852ad17049588ec7824ea96ead5b261a4 100644 (file)
--- a/include/filesys.h
+++ b/include/filesys.h
@@ -120,8 +120,6 @@ struct hd_hardfiledata {
 #define FILESYS_CD 4
 #define FILESYS_TAPE 5
 
-#define MAX_FILESYSTEM_UNITS 50
-
 struct uaedev_mount_info;
 extern struct uaedev_mount_info options_mountinfo;
 

diff --git a/include/options.h b/include/options.h
index 900cc613785c07d732a9caad97a292c6ce7b0123..7a9d3cd58683fa31e7b178aafd189390545447b5 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -171,7 +171,8 @@ struct wh {
        int special;
 };
 
-#define MOUNT_CONFIG_SIZE 30
+#define MOUNT_CONFIG_SIZE 50
+#define MAX_FILESYSTEM_UNITS 50
 #define UAEDEV_DIR 0
 #define UAEDEV_HDF 1
 #define UAEDEV_CD 2