valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Avoid passing null to strcat

Browse source 
Static analysis indicated an issue, when line was being passed as 2nd
argument to strcat:

Null pointer passed as an argument to a 'nonnull' parameter

Replace repeated strcat with creating a formatted string and use
the opportunity to do a small format cleanup.
This commit is contained in:
Patryk Obara 2019-11-23 22:01:31 +01:00 • committed by Patryk Obara
parent b344344821
commit 64671a888c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/shell/shell_cmds.cpp
View file

@ -104,17 +104,22 @@ static char* ExpandDot(char*args, char* buffer , size_t bufsize) {
bool DOS_Shell::CheckConfig(char* cmd_in,char*line) {
bool DOS_Shell::CheckConfig(char *cmd_in, char *line) {
Section* test = control->GetSectionFromProperty(cmd_in);
if(!test) return false;
if(line && !line[0]) {
if (!test)
return false;
if (line && !line[0]) {
std::string val = test->GetPropValue(cmd_in);
if(val != NO_SUCH_PROPERTY) WriteOut("%s\n",val.c_str());
if (val != NO_SUCH_PROPERTY)
WriteOut("%s\n", val.c_str());
return true;
}
char newcom[1024]; newcom[0] = 0; strcpy(newcom,"z:\\config -set ");
strcat(newcom,test->GetName()); strcat(newcom," ");
strcat(newcom,cmd_in);strcat(newcom,line);
char newcom[1024];
snprintf(newcom, sizeof(newcom), "z:\\config -set %s %s%s",
test->GetName(),
cmd_in,
line ? line : "");
DoCommand(newcom);
return true;
}