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

SCP: Assure that all formatted numbers have sufficient buffer space

Browse source
This commit is contained in:
Mark Pizzolato 2022-03-13 13:23:05 -07:00
parent 6c16052184
commit ee545a4828
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scp.c
View file

@ -248,6 +248,9 @@
#ifndef MIN #ifndef MIN
#define MIN(a,b) (((a) <= (b)) ? (a) : (b)) #define MIN(a,b) (((a) <= (b)) ? (a) : (b))
#endif #endif
/* Max width of a value expressed as a formatted string */
#define MAX_WIDTH ((int) ((CHAR_BIT * sizeof (t_value) * 4 + 3)/3))
/* search logical and boolean ops */ /* search logical and boolean ops */
@ -6469,7 +6472,7 @@ return SCPE_OK;
const char *sprint_capac (DEVICE *dptr, UNIT *uptr) const char *sprint_capac (DEVICE *dptr, UNIT *uptr)
{ {
static char capac_buf[((CHAR_BIT * sizeof (t_value) * 4 + 3)/3) + 12]; static char capac_buf[MAX_WIDTH + 12];
t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000; t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000;
t_addr mval; t_addr mval;
double remfrac; double remfrac;
@ -11668,7 +11671,6 @@ return val * negate;
t_stat sprint_val (char *buffer, t_value val, uint32 radix, t_stat sprint_val (char *buffer, t_value val, uint32 radix,
uint32 width, uint32 format) uint32 width, uint32 format)
{ {
#define MAX_WIDTH ((int) ((CHAR_BIT * sizeof (t_value) * 4 + 3)/3))
t_value owtest, wtest; t_value owtest, wtest;
t_bool negative = FALSE; t_bool negative = FALSE;
int32 d, digit, ndigits, commas = 0; int32 d, digit, ndigits, commas = 0;
@ -11679,8 +11681,7 @@ if (((format == PV_LEFTSIGN) || (format == PV_RCOMMASIGN)) &&
val = (t_value)(-((t_svalue)val)); val = (t_value)(-((t_svalue)val));
negative = TRUE; negative = TRUE;
} }
for (d = 0; d < MAX_WIDTH; d++) memset (dbuf, (format == PV_RZRO)? '0': ' ', MAX_WIDTH);
dbuf[d] = (format == PV_RZRO)? '0': ' ';
dbuf[MAX_WIDTH] = 0; dbuf[MAX_WIDTH] = 0;
d = MAX_WIDTH; d = MAX_WIDTH;
do { do {
@ -12848,13 +12849,14 @@ if (spc < SIM_BKPT_N_SPC) {
const char *sim_brk_message(void) const char *sim_brk_message(void)
{ {
static char msg[256]; static char msg[256];
char addr[65]; char addr[MAX_WIDTH];
char buf[32]; char buf[32];
msg[0] = '\0'; msg[0] = '\0';
if (sim_vm_sprint_addr) if (sim_vm_sprint_addr)
sim_vm_sprint_addr (addr, sim_dflt_dev, (t_value)sim_brk_match_addr); sim_vm_sprint_addr (addr, sim_dflt_dev, (t_value)sim_brk_match_addr);
else sprint_val (addr, (t_value)sim_brk_match_addr, sim_dflt_dev->aradix, sim_dflt_dev->awidth, PV_LEFT); else
sprint_val (addr, (t_value)sim_brk_match_addr, sim_dflt_dev->aradix, sim_dflt_dev->awidth, PV_LEFT);
if (sim_brk_type_desc) { if (sim_brk_type_desc) {
BRKTYPTAB *brk = sim_brk_type_desc; BRKTYPTAB *brk = sim_brk_type_desc;
@ -13771,7 +13773,7 @@ static const char *sim_debug_prefix (uint32 dbits, DEVICE* dptr, UNIT* uptr)
const char* debug_type = _get_dbg_verb (dbits, dptr, uptr); const char* debug_type = _get_dbg_verb (dbits, dptr, uptr);
char tim_t[32] = ""; char tim_t[32] = "";
char tim_a[32] = ""; char tim_a[32] = "";
char pc_s[64] = ""; char pc_s[MAX_WIDTH] = "";
struct timespec time_now; struct timespec time_now;
if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) { if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) {
@ -15859,7 +15861,7 @@ return ((*gptr == '\0') && (*string));
static t_svalue sim_eval_postfix (Stack *stack1, t_stat *stat) static t_svalue sim_eval_postfix (Stack *stack1, t_stat *stat)
{ {
Stack *stack2 = new_Stack(); /* local working stack2 which is holds the numbers operators */ Stack *stack2 = new_Stack(); /* local working stack2 which is holds the numbers operators */
char temp_data[CBUFSIZE]; /* Holds the items popped from the stack2 */ char temp_data[CBUFSIZE + 2]; /* Holds the items popped from the stack2 */
Operator *temp_op; Operator *temp_op;
t_svalue temp_val; t_svalue temp_val;
char temp_string[CBUFSIZE + 2]; char temp_string[CBUFSIZE + 2];