From 37a6f796dea83758bb92a2fb06ddead0140f06f6 Mon Sep 17 00:00:00 2001 From: TomW Date: Thu, 19 Nov 2015 19:44:38 +0000 Subject: [PATCH] Fix crash on loading with invalid mem_size values in config. --- src/pc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pc.c b/src/pc.c index 0b32727..57ae3d9 100644 --- a/src/pc.c +++ b/src/pc.c @@ -553,6 +553,9 @@ void loadconfig(char *fn) else strcpy(discfns[1], ""); mem_size = config_get_int(NULL, "mem_size", 4096); + if (mem_size < (models[model].is_at ? models[model].min_ram*1024 : models[model].min_ram)) + mem_size = (models[model].is_at ? models[model].min_ram*1024 : models[model].min_ram); + cdrom_drive = config_get_int(NULL, "cdrom_drive", 0); cdrom_enabled = config_get_int(NULL, "cdrom_enabled", 0);