80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix crashes caused by an invalid CPU index

Browse Source
This commit is contained in:
RichardG867
2020-07-25 12:48:20 -03:00
parent 6e7508edb4
commit 4d621e2f4f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.c
View File

@@ -531,7 +531,18 @@ load_machine(void)
machine = machine_count() - 1; machine = machine_count() - 1;
cpu_manufacturer = config_get_int(cat, "cpu_manufacturer", 0); cpu_manufacturer = config_get_int(cat, "cpu_manufacturer", 0);
if ((cpu_manufacturer >= (sizeof(machines[machine].cpu) / sizeof(machines[machine].cpu[0]))) ||
(machines[machine].cpu[cpu_manufacturer].cpus == NULL))
cpu_manufacturer = 0;
cpu = config_get_int(cat, "cpu", 0); cpu = config_get_int(cat, "cpu", 0);
for (int i = 0; i != cpu; i++) {
if (machines[machine].cpu[cpu_manufacturer].cpus[i].cpu_type == -1) {
cpu = 0;
break;
}
}
cpu_waitstates = config_get_int(cat, "cpu_waitstates", 0); cpu_waitstates = config_get_int(cat, "cpu_waitstates", 0);
p = (char *)config_get_string(cat, "fpu_type", "none"); p = (char *)config_get_string(cat, "fpu_type", "none");
@@ -543,7 +554,7 @@ load_machine(void)
if (mem_size < (((machines[machine].flags & MACHINE_AT) && if (mem_size < (((machines[machine].flags & MACHINE_AT) &&
(machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram)) (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram))
mem_size = (((machines[machine].flags & MACHINE_AT) && (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram); mem_size = (((machines[machine].flags & MACHINE_AT) && (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram);
#endif #endif
if (mem_size > 2097152) if (mem_size > 2097152)
mem_size = 2097152; mem_size = 2097152;