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

must initialize deleted pointers to null since the following commands may fail

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-10-21 06:28:14 -04:00
parent 1db5643d6e
commit a7fb81c68e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/force.cpp
View File

@ -336,6 +336,8 @@ void Force::create_bond(const std::string &style, int trysuffix)
{ {
delete[] bond_style; delete[] bond_style;
if (bond) delete bond; if (bond) delete bond;
bond_style = nullptr;
bond = nullptr;
int sflag; int sflag;
bond = new_bond(style, trysuffix, sflag); bond = new_bond(style, trysuffix, sflag);
@ -404,6 +406,8 @@ void Force::create_angle(const std::string &style, int trysuffix)
{ {
delete[] angle_style; delete[] angle_style;
if (angle) delete angle; if (angle) delete angle;
angle_style = nullptr;
angle = nullptr;
int sflag; int sflag;
angle = new_angle(style, trysuffix, sflag); angle = new_angle(style, trysuffix, sflag);
@ -472,6 +476,8 @@ void Force::create_dihedral(const std::string &style, int trysuffix)
{ {
delete[] dihedral_style; delete[] dihedral_style;
if (dihedral) delete dihedral; if (dihedral) delete dihedral;
dihedral_style = nullptr;
dihedral = nullptr;
int sflag; int sflag;
dihedral = new_dihedral(style, trysuffix, sflag); dihedral = new_dihedral(style, trysuffix, sflag);
@ -540,6 +546,8 @@ void Force::create_improper(const std::string &style, int trysuffix)
{ {
delete[] improper_style; delete[] improper_style;
if (improper) delete improper; if (improper) delete improper;
improper_style = nullptr;
improper = nullptr;
int sflag; int sflag;
improper = new_improper(style, trysuffix, sflag); improper = new_improper(style, trysuffix, sflag);
@ -608,6 +616,8 @@ void Force::create_kspace(const std::string &style, int trysuffix)
{ {
delete[] kspace_style; delete[] kspace_style;
if (kspace) delete kspace; if (kspace) delete kspace;
kspace_style = nullptr;
kspace = nullptr;
int sflag; int sflag;
kspace = new_kspace(style, trysuffix, sflag); kspace = new_kspace(style, trysuffix, sflag);

4
src/update.cpp
View File

@ -332,6 +332,8 @@ void Update::create_integrate(int narg, char **arg, int trysuffix)
delete[] integrate_style; delete[] integrate_style;
delete integrate; delete integrate;
integrate_style = nullptr;
integrate = nullptr;
int sflag; int sflag;
@ -400,6 +402,8 @@ void Update::create_minimize(int narg, char **arg, int trysuffix)
delete[] minimize_style; delete[] minimize_style;
delete minimize; delete minimize;
minimize_style = nullptr;
minimize = nullptr;
// temporarily assign the style name without suffix (for error messages during creation) // temporarily assign the style name without suffix (for error messages during creation)
minimize_style = arg[0]; minimize_style = arg[0];