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

avoid a case of mixing malloc()/free() with new/delete

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-06-10 18:22:04 -04:00
parent 72b295d7f4
commit 3e2f3a8058
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/variable.cpp
View File

@ -288,11 +288,11 @@ void Variable::set(int narg, char **arg)
int maxcopy = strlen(arg[2]) + 1; int maxcopy = strlen(arg[2]) + 1;
int maxwork = maxcopy; int maxwork = maxcopy;
char *scopy = new char[maxcopy]; char *scopy = (char *) memory->smalloc(maxcopy,"var:string/copy");
char *work = new char[maxwork]; char *work = (char *) memory->smalloc(maxwork,"var:string/work");
strcpy(scopy,arg[2]); strcpy(scopy,arg[2]);
input->substitute(scopy,work,maxcopy,maxwork,1); input->substitute(scopy,work,maxcopy,maxwork,1);
delete [] work; memory->sfree(work);
int ivar = find(arg[0]); int ivar = find(arg[0]);
if (ivar >= 0) { if (ivar >= 0) {
@ -310,7 +310,7 @@ void Variable::set(int narg, char **arg)
data[nvar] = new char*[num[nvar]]; data[nvar] = new char*[num[nvar]];
copy(1,&scopy,data[nvar]); copy(1,&scopy,data[nvar]);
} }
delete [] scopy; memory->sfree(scopy);
// GETENV // GETENV
// remove pre-existing var if also style GETENV (allows it to be reset) // remove pre-existing var if also style GETENV (allows it to be reset)