Unverified Commit 3e2f3a80 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

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

parent 72b295d7
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -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)