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

SCP: Fix expression evaluation divide by zero, and avoid parameter substitution

Browse source 
This allows bare the % character to to properly be the moduls operator and
avoids potential ambiguous variable insertions.
This commit is contained in:
Mark Pizzolato 2018-05-24 12:59:23 -07:00
parent 0daff9026d
commit c294787aed
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scp.c
View file

@ -555,10 +555,10 @@ int32 sim_brk_lnt = 0;
int32 sim_brk_ins = 0; int32 sim_brk_ins = 0;
int32 sim_quiet = 0; int32 sim_quiet = 0;
int32 sim_step = 0; int32 sim_step = 0;
char *sim_sub_instr = NULL; char *sim_sub_instr = NULL; /* Copy of pre-substitution buffer contents */
char *sim_sub_instr_buf = NULL; char *sim_sub_instr_buf = NULL; /* Buffer address that substitutions were saved in */
size_t sim_sub_instr_size = 0; size_t sim_sub_instr_size = 0; /* substitution buffer size */
size_t *sim_sub_instr_off = NULL; size_t *sim_sub_instr_off = NULL; /* offsets in substitution buffer where original data started */
static double sim_time; static double sim_time;
static uint32 sim_rtime; static uint32 sim_rtime;
static int32 noqueue_time; static int32 noqueue_time;
@ -4696,10 +4696,10 @@ else {
cptr = get_glyph (cptr, varname, '='); /* get environment variable name */ cptr = get_glyph (cptr, varname, '='); /* get environment variable name */
strlcpy (cbuf, cptr, sizeof(cbuf)); strlcpy (cbuf, cptr, sizeof(cbuf));
sim_trim_endspc (cbuf); sim_trim_endspc (cbuf);
cptr = cbuf;
if (sim_switches & SWMASK ('S')) { /* Quote String argument? */ if (sim_switches & SWMASK ('S')) { /* Quote String argument? */
uint32 str_size; uint32 str_size;
cptr = cbuf;
get_glyph_quoted (cptr, cbuf, 0); get_glyph_quoted (cptr, cbuf, 0);
if (SCPE_OK != sim_decode_quoted_string (cbuf, (uint8 *)cbuf, &str_size)) if (SCPE_OK != sim_decode_quoted_string (cbuf, (uint8 *)cbuf, &str_size))
return sim_messagef (SCPE_ARG, "Invalid quoted string: %s\n", cbuf); return sim_messagef (SCPE_ARG, "Invalid quoted string: %s\n", cbuf);
@ -4709,8 +4709,11 @@ else {
if (sim_switches & SWMASK ('A')) { /* Arithmentic Expression Evaluation argument? */ if (sim_switches & SWMASK ('A')) { /* Arithmentic Expression Evaluation argument? */
t_svalue val; t_svalue val;
t_stat stat; t_stat stat;
const char *eptr = cptr;
cptr = sim_eval_expression (cptr, &val, FALSE, &stat); if ((cptr > sim_sub_instr_buf) && ((size_t)(cptr - sim_sub_instr_buf) < sim_sub_instr_size))
eptr = &sim_sub_instr[sim_sub_instr_off[cptr - sim_sub_instr_buf]]; /* get un-substituted string */
cptr = sim_eval_expression (eptr, &val, FALSE, &stat);
if (stat == SCPE_OK) { if (stat == SCPE_OK) {
sprintf (cbuf, "%ld", (long)val); sprintf (cbuf, "%ld", (long)val);
cptr = cbuf; cptr = cbuf;
@ -13469,12 +13472,16 @@ return factorx * factory;
static t_svalue _op_div (t_svalue divisor, t_svalue dividend) static t_svalue _op_div (t_svalue divisor, t_svalue dividend)
{ {
if (divisor != 0)
return dividend / divisor; return dividend / divisor;
return T_SVALUE_MAX;
} }
static t_svalue _op_mod (t_svalue divisor, t_svalue dividend) static t_svalue _op_mod (t_svalue divisor, t_svalue dividend)
{ {
if (divisor != 0)
return dividend % divisor; return dividend % divisor;
return 0;
} }
static t_svalue _op_comp (t_svalue data, t_svalue unused) static t_svalue _op_comp (t_svalue data, t_svalue unused)

2
sim_defs.h
View file

@ -239,10 +239,12 @@ typedef unsigned long t_uint64;
typedef t_int64 t_svalue; /* signed value */ typedef t_int64 t_svalue; /* signed value */
typedef t_uint64 t_value; /* value */ typedef t_uint64 t_value; /* value */
#define T_VALUE_MAX 0xffffffffffffffffuLL #define T_VALUE_MAX 0xffffffffffffffffuLL
#define T_SVALUE_MAX 0x7fffffffffffffffLL
#else /* 32b data */ #else /* 32b data */
typedef int32 t_svalue; typedef int32 t_svalue;
typedef uint32 t_value; typedef uint32 t_value;
#define T_VALUE_MAX 0xffffffffUL #define T_VALUE_MAX 0xffffffffUL
#define T_SVALUE_MAX 0x7fffffffL
#endif /* end 64b data */ #endif /* end 64b data */
#if defined (USE_INT64) && defined (USE_ADDR64) /* 64b address */ #if defined (USE_INT64) && defined (USE_ADDR64) /* 64b address */