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

avoid illegal free()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-07-08 16:29:40 -04:00
parent ed452c3624
commit 207232c1a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/input.cpp
View File

@ -1913,6 +1913,7 @@ void Input::suffix()
delete [] lmp->suffix; delete [] lmp->suffix;
delete [] lmp->suffix2; delete [] lmp->suffix2;
lmp->suffix = lmp->suffix2 = nullptr;
if (strcmp(arg[0],"hybrid") == 0) { if (strcmp(arg[0],"hybrid") == 0) {
if (narg != 3) error->all(FLERR,"Illegal suffix command"); if (narg != 3) error->all(FLERR,"Illegal suffix command");
@ -1927,7 +1928,6 @@ void Input::suffix()
int n = strlen(arg[0]) + 1; int n = strlen(arg[0]) + 1;
lmp->suffix = new char[n]; lmp->suffix = new char[n];
strcpy(lmp->suffix,arg[0]); strcpy(lmp->suffix,arg[0]);
lmp->suffix2 = nullptr;
} }
} }
} }

2
src/lammps.cpp
View File

@ -335,7 +335,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) :
error->universe_all(FLERR,"Invalid command-line argument"); error->universe_all(FLERR,"Invalid command-line argument");
delete [] suffix; delete [] suffix;
delete [] suffix2; delete [] suffix2;
suffix2 = NULL; suffix = suffix2 = NULL;
suffix_enable = 1; suffix_enable = 1;
// hybrid option to set fall-back for suffix2 // hybrid option to set fall-back for suffix2
if (strcmp(arg[iarg+1],"hybrid") == 0) { if (strcmp(arg[iarg+1],"hybrid") == 0) {