tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add checks when reading QEQ parameter file to avoid segfaults and memory corruption on incorrect files

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-08-18 19:24:39 -04:00
parent 2e6a928aa3
commit 44ccdb86df
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/QEQ/fix_qeq.cpp
View File

@ -747,18 +747,26 @@ void FixQEq::read_file(char *file)
nwords = atom->count_words(line);
if (nwords == 0) continue;
// words = ptrs to all words in line
// must have 6 parameters per line.
nwords = 0;
words[nwords++] = strtok(line," \t\n\r\f");
while ((words[nwords++] = strtok(NULL," \t\n\r\f"))) continue;
if (nwords < 6)
error->all(FLERR,"Invalid fix qeq parameter file");
itype = atoi(words[0]);
chi[itype] = atof(words[1]);
eta[itype] = atof(words[2]);
gamma[itype] = atof(words[3]);
zeta[itype] = atof(words[4]);
zcore[itype] = atof(words[5]);
// words = ptrs to first 6 words in line
for (n=0, words[n] = strtok(line," \t\n\r\f");
n < 6;
words[++n] = strtok(NULL," \t\n\r\f"));
itype = force->inumeric(FLERR,words[0]);
if ((itype < 1) || (itype > atom->ntypes))
error->all(FLERR,"Invalid fix qeq parameter file");
chi[itype] = force->numeric(FLERR,words[1]);
eta[itype] = force->numeric(FLERR,words[2]);
gamma[itype] = force->numeric(FLERR,words[3]);
zeta[itype] = force->numeric(FLERR,words[4]);
zcore[itype] = force->numeric(FLERR,words[5]);
}
delete [] words;
}