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

avoid double initialization and potential double free

Browse Source
This commit is contained in:
Axel Kohlmeyer
2025-01-21 11:22:25 -05:00
parent f4b8200bcc
commit 8c2d83c5eb
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dump_image.cpp
View File

@ -124,7 +124,6 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) :
atomflag = YES; atomflag = YES;
gridflag = NO; gridflag = NO;
lineflag = triflag = bodyflag = fixflag = NO; lineflag = triflag = bodyflag = fixflag = NO;
id_grid_compute = id_grid_fix = nullptr;
if (atom->nbondtypes == 0) bondflag = NO; if (atom->nbondtypes == 0) bondflag = NO;
else { else {
@ -188,10 +187,13 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) :
igrid,idata,index,lmp); igrid,idata,index,lmp);
if (iflag < 0) error->all(FLERR,"Invalid grid reference in dump image command"); if (iflag < 0) error->all(FLERR,"Invalid grid reference in dump image command");
if (iflag == ArgInfo::COMPUTE) {
delete[] id_grid_compute; delete[] id_grid_compute;
id_grid_compute = utils::strdup(id);
} else if (iflag == ArgInfo::FIX) {
delete[] id_grid_fix; delete[] id_grid_fix;
if (iflag == ArgInfo::COMPUTE) id_grid_compute = utils::strdup(id); id_grid_fix = utils::strdup(id);
else if (iflag == ArgInfo::FIX) id_grid_fix = utils::strdup(id); }
delete[] id; delete[] id;
grid_igrid = igrid; grid_igrid = igrid;
grid_idata = idata; grid_idata = idata;
@ -465,15 +467,8 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) :
// local data // local data
grid_compute = nullptr;
grid_fix = nullptr;
maxbufcopy = 0; maxbufcopy = 0;
chooseghost = nullptr;
bufcopy = nullptr;
maxgrid = 0; maxgrid = 0;
gbuf = nullptr;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */