From 857934d40ee17e79457a2a75a32e59118a04e15c Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 19 Feb 2019 12:11:29 -0800 Subject: [PATCH] SCP: Properly report errors in malformed SET ENV -P commands --- scp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scp.c b/scp.c index 0f66f7b9..b98cfe51 100644 --- a/scp.c +++ b/scp.c @@ -5091,10 +5091,14 @@ if (sim_switches & SWMASK ('P')) { if (prompt[0] == '\0') return sim_messagef (SCPE_2FARG, "Missing Prompt and Environment Variable Name\n"); if ((prompt[0] == '"') || (prompt[0] == '\'')) { + if (strlen (prompt) < 3) + return sim_messagef (SCPE_ARG, "Invalid Prompt\n"); prompt[strlen (prompt) - 1] = '\0'; memmove (prompt, prompt + 1, strlen (prompt)); } deflt = get_glyph (cptr, varname, '='); /* get environment variable name */ + if (varname[0] == '\0') + return sim_messagef (SCPE_2FARG, "Missing Environment Variable Name\n"); if (deflt == NULL) deflt = ""; if (*deflt) {