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

simplify; make certain nmax is always initialized

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-08-22 23:39:29 -04:00
parent 42dec6fe6e
commit b300ef29ee
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils.cpp
View File

@ -1005,8 +1005,6 @@ int utils::expand_type_int(const char *file, int line, const std::string &str, i
char *typestr = expand_type(file, line, str, mode, lmp); char *typestr = expand_type(file, line, str, mode, lmp);
int type = inumeric(file, line, typestr ? typestr : str, false, lmp); int type = inumeric(file, line, typestr ? typestr : str, false, lmp);
if (verify) { if (verify) {
int errorflag = 0;
if (type <= 0) errorflag = 1;
int nmax; int nmax;
switch (mode) { switch (mode) {
case Atom::ATOM: case Atom::ATOM:
@ -1024,10 +1022,12 @@ int utils::expand_type_int(const char *file, int line, const std::string &str, i
case Atom::IMPROPER: case Atom::IMPROPER:
nmax = lmp->atom->nimpropertypes; nmax = lmp->atom->nimpropertypes;
break; break;
default:
nmax = 0;
} }
if (type > nmax) errorflag = 1; if ((type <= 0) || (type > nmax))
if (errorflag) lmp->error->all(file, line, "{} type {} is out of bounds ({}-{})", lmp->error->all(file, line, "{} type {} is out of bounds ({}-{})", labeltypes[mode], type, 1,
labeltypes[mode], type, 1, nmax); nmax);
} }
delete[] typestr; delete[] typestr;
return type; return type;