folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

All: Declare sim_stop_messages as an array SCPE_BASE long

Browse source 
This avoids a potential invalid pointer dereference when formatting
the return value from sim_instr() if it is < SCPE_BASE but greater
than the previously defined static array size.sizeof

Update simh.doc to reflect this generic change.
This commit is contained in:
Mark Pizzolato 2020-09-02 15:56:07 -07:00
parent 782fe167ca
commit ae825c9afb
46 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3B2/3b2_400_sys.c
View file

@ -60,7 +60,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Reserved Instruction", "Reserved Instruction",
"Breakpoint", "Breakpoint",

2
ALTAIR/altair_sys.c
View file

@ -63,7 +63,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",

2
AltairZ80/altairz80_sys.c
View file

@ -145,7 +145,7 @@ DEVICE *sim_devices[] = {
static char memoryAccessMessage[256]; static char memoryAccessMessage[256];
static char instructionMessage[256]; static char instructionMessage[256];
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",
memoryAccessMessage, memoryAccessMessage,

2
B5500/b5500_sys.c
View file

@ -76,7 +76,7 @@ DEVICE *sim_devices[] = {
}; };
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
0, 0,
}; };

2
BESM6/besm6_cpu.c
View file

@ -284,7 +284,7 @@ DEVICE *sim_devices[] = {
0 0
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Неизвестная ошибка", /* Unknown error */ "Неизвестная ошибка", /* Unknown error */
"Останов", /* STOP */ "Останов", /* STOP */
"Точка останова", /* Emulator breakpoint */ "Точка останова", /* Emulator breakpoint */

2
CDC1700/cdc1700_sys.c
View file

@ -85,7 +85,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"OK", "OK",
"Indirect addressing loop count exceeded", "Indirect addressing loop count exceeded",
"Selective Stop", "Selective Stop",

2
GRI/gri_sys.c
View file

@ -67,7 +67,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unimplemented unit", "Unimplemented unit",
"HALT instruction", "HALT instruction",

2
H316/h316_sys.c
View file

@ -88,7 +88,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unimplemented instruction", "Unimplemented instruction",
"Unimplemented I/O device", "Unimplemented I/O device",

2
HP2100/hp2100_sys.c
View file

@ -1968,7 +1968,7 @@ DEVICE *sim_devices [] = { /* an array of pointers to the s
#define DEVICE_COUNT (sizeof sim_devices / sizeof sim_devices [0] - 1) /* the count excludes the NULL pointer */ #define DEVICE_COUNT (sizeof sim_devices / sizeof sim_devices [0] - 1) /* the count excludes the NULL pointer */
const char *sim_stop_messages [] = { /* an array of pointers to the stop messages in STOP_nnn order */ const char *sim_stop_messages [SCPE_BASE] = { /* an array of pointers to the stop messages in STOP_nnn order */
"Impossible error", /* 0 (never returned) */ "Impossible error", /* 0 (never returned) */
"Unimplemented instruction", /* STOP_UNIMPL */ "Unimplemented instruction", /* STOP_UNIMPL */
"Unassigned select code", /* STOP_UNSC */ "Unassigned select code", /* STOP_UNSC */

2
HP3000/hp3000_sys.c
View file

@ -1099,7 +1099,7 @@ DEVICE *sim_devices [] = { /* an array of pointers to the s
#define DEVICE_COUNT (sizeof sim_devices / sizeof sim_devices [0] - 1) #define DEVICE_COUNT (sizeof sim_devices / sizeof sim_devices [0] - 1)
const char *sim_stop_messages [] = { /* an array of pointers to the stop messages in STOP_nnn order */ const char *sim_stop_messages [SCPE_BASE] = { /* an array of pointers to the stop messages in STOP_nnn order */
"Impossible error", /* 0 (never returned) */ "Impossible error", /* 0 (never returned) */
"System halt", /* STOP_SYSHALT */ "System halt", /* STOP_SYSHALT */
"Unimplemented instruction", /* STOP_UNIMPL */ "Unimplemented instruction", /* STOP_UNIMPL */

2
I1401/i1401_sys.c
View file

@ -84,7 +84,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unimplemented instruction", "Unimplemented instruction",
"Non-existent memory", "Non-existent memory",

2
I1620/i1620_sys.c
View file

@ -70,7 +70,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
I650/i650_sys.c
View file

@ -58,7 +58,7 @@ DIB mt_dib = { 5, &mt_cmd, &mt_ini };
DIB dsk_dib = { 4, &mt_cmd, &dsk_ini }; DIB dsk_dib = { 4, &mt_cmd, &dsk_ini };
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
I7000/i7010_sys.c
View file

@ -115,7 +115,7 @@ DIB com_dib = { CH_TYP_79XX|CH_TYP_UREC, 0, 04200, 07700, &com_cmd, NULL };
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
I7000/i701_sys.c
View file

@ -82,7 +82,7 @@ DIB mt_dib = { CH_TYP_PIO, NUM_UNITS_MT, 0400, 07770, &mt_cmd, &mt_ini };
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
I7000/i7070_sys.c
View file

@ -116,7 +116,7 @@ DIB com_dib = { CH_TYP_79XX, 0, 0, 0, &com_cmd, NULL };
#endif #endif
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
I7000/i7080_sys.c
View file

@ -130,7 +130,7 @@ DIB com_dib = { CH_TYP_79XX, 0, 0, 0, &com_cmd, NULL };
#endif #endif
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
I7000/i7090_sys.c
View file

@ -143,7 +143,7 @@ DIB hsdrm_dib = { CH_TYP_SPEC, 1, 0330, 0777, &hsdrm_cmd, &hsdrm_ini };
/* Simulator stop codes */ /* Simulator stop codes */
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
I7094/i7094_sys.c
View file

@ -95,7 +95,7 @@ DEVICE *sim_devices[] = {
char ch_bkpt_msg[] = "Channel A breakpoint, CLC: xxxxxx"; char ch_bkpt_msg[] = "Channel A breakpoint, CLC: xxxxxx";
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
Ibm1130/ibm1130_sys.c
View file

@ -71,7 +71,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Wait", "Wait",
"Invalid command", "Invalid command",

2
Intel-Systems/ibmpc/ibmpc_sys.c
View file

@ -85,7 +85,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",

2
Intel-Systems/ibmpcxt/ibmpcxt_sys.c
View file

@ -85,7 +85,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",

2
Interdata/id16_sys.c
View file

@ -86,7 +86,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Reserved instruction", "Reserved instruction",
"HALT instruction", "HALT instruction",

2
Interdata/id32_sys.c
View file

@ -90,7 +90,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Reserved instruction", "Reserved instruction",
"HALT instruction", "HALT instruction",

2
LGP/lgp_sys.c
View file

@ -66,7 +66,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"STOP", "STOP",
"Breakpoint", "Breakpoint",

2
NOVA/nova_sys.c
View file

@ -125,7 +125,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O instruction", "Unknown I/O instruction",
"HALT instruction", "HALT instruction",

2
PDP1/pdp1_sys.c
View file

@ -103,7 +103,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Undefined instruction", "Undefined instruction",
"HALT instruction", "HALT instruction",

2
PDP10/kx10_sys.c
View file

@ -215,7 +215,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
PDP10/pdp10_sys.c
View file

@ -104,7 +104,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
PDP11/pdp11_sys.c
View file

@ -218,7 +218,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Red stack trap", "Red stack trap",
"Odd address trap", "Odd address trap",

2
PDP18B/pdp18b_sys.c
View file

@ -194,7 +194,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Undefined instruction", "Undefined instruction",
"HALT instruction", "HALT instruction",

2
PDP8/pdp8_sys.c
View file

@ -115,7 +115,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unimplemented instruction", "Unimplemented instruction",
"HALT instruction", "HALT instruction",

2
PDQ-3/pdq3_sys.c
View file

@ -69,7 +69,7 @@ DEVICE *sim_devices[] = {
&tim_dev, &tim_dev,
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"---", "---",
"PC Breakpoint", "PC Breakpoint",
"MEM Breakpoint", "MEM Breakpoint",

2
S3/s3_sys.c
View file

@ -79,7 +79,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",

2
SAGE/m68k_sys.c
View file

@ -272,7 +272,7 @@ t_stat sim_load(FILE* fptr, CONST char* cptr, CONST char* fnam, t_bool flag)
return SCPE_OK; return SCPE_OK;
} }
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"---", "---",
"PC Breakpoint", "PC Breakpoint",
"MEM Breakpoint", "MEM Breakpoint",

2
SDS/sds_sys.c
View file

@ -83,7 +83,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"IO device not ready", "IO device not ready",
"HALT instruction", "HALT instruction",

2
SSEM/ssem_sys.c
View file

@ -64,7 +64,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Stop", "Stop",
"Breakpoint", "Breakpoint",

2
TX-0/tx0_sys.c
View file

@ -90,7 +90,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Undefined instruction", "Undefined instruction",
"HALT instruction", "HALT instruction",

2
VAX/vax_sys.c
View file

@ -86,7 +86,7 @@ REG *sim_PC = &cpu_reg[0];
int32 sim_emax = 60; int32 sim_emax = 60;
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
alpha/alpha_sys.c
View file

@ -53,7 +53,7 @@ REG *sim_PC = &cpu_reg[0];
int32 sim_emax = 1; int32 sim_emax = 1;
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

BIN
doc/simh.doc
View file

Binary file not shown.

2
imlac/imlac_sys.c
View file

@ -53,7 +53,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"HALT instruction", "HALT instruction",
"Breakpoint", "Breakpoint",

2
sigma/sigma_sys.c
View file

@ -96,7 +96,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Invalid I/O configuration", "Invalid I/O configuration",
"Breakpoint", "Breakpoint",

3
sim_defs.h
View file

@ -93,7 +93,8 @@
sim_devices[] array of pointers to simulated devices sim_devices[] array of pointers to simulated devices
sim_PC pointer to saved PC register descriptor sim_PC pointer to saved PC register descriptor
sim_interval simulator interval to next event sim_interval simulator interval to next event
sim_stop_messages[] array of pointers to stop messages sim_stop_messages[SCPE_BASE]
array of pointers to stop messages
sim_instr() instruction execution routine sim_instr() instruction execution routine
sim_load() binary loader routine sim_load() binary loader routine
sim_emax maximum number of words in an instruction sim_emax maximum number of words in an instruction

2
swtp6800/swtp6800/mp-a2_sys.c
View file

@ -75,7 +75,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",

2
swtp6800/swtp6800/mp-a_sys.c
View file

@ -73,7 +73,7 @@ DEVICE *sim_devices[] = {
NULL NULL
}; };
const char *sim_stop_messages[] = { const char *sim_stop_messages[SCPE_BASE] = {
"Unknown error", "Unknown error",
"Unknown I/O Instruction", "Unknown I/O Instruction",
"HALT instruction", "HALT instruction",