epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Error case for NULL arg causing segfault in iocshPersistentString

Browse Source
This commit is contained in:
Aaron
2020-02-12 11:58:32 +00:00
committed by Michael Davidsaver
parent 2bcaa5448c
commit 45bbe274e9
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/libcom/src/iocsh/iocsh.cpp
View File

@@ -314,13 +314,18 @@ cvtArg (const char *filename, int lineno, char *arg, iocshArgBuf *argBuf,
break;
case iocshArgPersistentString:
argBuf->sval = (char *) malloc(strlen(arg) + 1);
if (argBuf->sval == NULL) {
showError(filename, lineno, "Out of memory");
if (arg != NULL) {
argBuf->sval = (char *) malloc(strlen(arg) + 1);
if (argBuf->sval == NULL) {
showError(filename, lineno, "Out of memory");
return 0;
}
strcpy(argBuf->sval, arg);
break;
} else {
showError(filename, lineno, "Unable to copy as provided arg was NULL");
return 0;
}
strcpy(argBuf->sval, arg);
break;
case iocshArgPdbbase:
/* Argument must be missing or 0 or pdbbase */