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

SCP: Add checks to avoid potential buffer overrun (Coverity)

Browse source
This commit is contained in:
Mark Pizzolato 2017-03-28 19:36:12 -07:00
parent d60c56d18f
commit 8d8a286c58
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scp.c
View file

@ -2937,7 +2937,8 @@ if (flag >= 0) { /* Only bump nesting fro
} }
} }
strcpy( sim_do_filename[sim_do_depth], do_arg[0]); /* stash away do file name for possible use by 'call' command */ sim_strlcpy( sim_do_filename[sim_do_depth], do_arg[0],
sizeof (sim_do_filename[sim_do_depth])); /* stash away do file name for possible use by 'call' command */
sim_do_label[sim_do_depth] = label; /* stash away do label for possible use in messages */ sim_do_label[sim_do_depth] = label; /* stash away do label for possible use in messages */
sim_goto_line[sim_do_depth] = 0; sim_goto_line[sim_do_depth] = 0;
if (label) { if (label) {
@ -5075,16 +5076,18 @@ struct stat filestat;
char *c; char *c;
char DirName[PATH_MAX + 1], WholeName[PATH_MAX + 1], WildName[PATH_MAX + 1]; char DirName[PATH_MAX + 1], WholeName[PATH_MAX + 1], WildName[PATH_MAX + 1];
strcpy (WildName, cptr); memset (DirName, 0, sizeof(DirName));
memset (WholeName, 0, sizeof(WholeName));
sim_strlcpy (WildName, cptr, sizeof(WildName));
cptr = WildName; cptr = WildName;
sim_trim_endspc (WildName); sim_trim_endspc (WildName);
if ((!stat (WildName, &filestat)) && (filestat.st_mode & S_IFDIR)) if ((!stat (WildName, &filestat)) && (filestat.st_mode & S_IFDIR))
sim_strlcat (WildName, "/*", sizeof(WildName)); sim_strlcat (WildName, "/*", sizeof(WildName));
if ((*cptr != '/') || (0 == memcmp (cptr, "./", 2)) || (0 == memcmp (cptr, "../", 3))) { if ((*cptr != '/') || (0 == memcmp (cptr, "./", 2)) || (0 == memcmp (cptr, "../", 3))) {
#if defined (VMS) #if defined (VMS)
getcwd (WholeName, PATH_MAX, 0); getcwd (WholeName, sizeof(WholeName)-1, 0);
#else #else
getcwd (WholeName, PATH_MAX); getcwd (WholeName, sizeof(WholeName)-1);
#endif #endif
sim_strlcat (WholeName, "/", sizeof(WholeName)); sim_strlcat (WholeName, "/", sizeof(WholeName));
sim_strlcat (WholeName, cptr, sizeof(WholeName)); sim_strlcat (WholeName, cptr, sizeof(WholeName));
@ -5112,9 +5115,9 @@ if (c) {
} }
else { else {
#if defined (VMS) #if defined (VMS)
getcwd (WholeName, PATH_MAX, 0); getcwd (WholeName, sizeof(WholeName)-1, 0);
#else #else
getcwd (WholeName, PATH_MAX); getcwd (WholeName, sizeof(WholeName)-1);
#endif #endif
} }
cptr = WholeName; cptr = WholeName;