ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor error code handler to avoid possible string overflows and handle out of range argument

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-03-27 21:09:20 -04:00
parent d37e7a5025
commit 2a7f690bf2
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/USER-MEAMC/pair_meamc.cpp
View File

@ -595,16 +595,15 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
int errorflag = 0;
meam_inst->meam_setup_param(which,value,nindex,index,&errorflag);
if (errorflag) {
char str[128];
snprintf(str,80,"Error in MEAM parameter file: keyword %s",params[0]);
switch(errorflag) {
case 1: strcat(str, " is out of range (please report a bug)"); break;
case 2: strcat(str, " expected more indices"); break;
case 3: strcat(str, " has out of range element index"); break;
}
const char *descr[] = { "has an unknown error",
"is out of range (please report a bug)",
"expected more indices",
"has out of range element index"};
char str[256];
if ((errorflag < 0) || (errorflag > 3)) errorflag = 0;
snprintf(str,256,"Error in MEAM parameter file: keyword %s %s",params[0],descr[errorflag]);
error->all(FLERR,str);
}
}
delete [] params;
}