debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcreate: Fix double free inside ProcessExecString()

Browse Source
This commit is contained in:
William Schaub
2012-08-11 14:46:35 -04:00
committed by Jon Trulson
parent 562da5af1b
commit b17e52a269
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtcreate/parser.c
View File

@@ -851,7 +851,7 @@ int done=FALSE, argfound=FALSE,promptfound=FALSE;
covers the complete string covers the complete string
between %'s between %'s
*/ */
if(argbuf) free(argbuf); if(argbuf) { free(argbuf); argbuf = NULL; }
if(s2) if(s2)
{ {
argbuf = (char *)calloc(1,(s2-s1)+2); argbuf = (char *)calloc(1,(s2-s1)+2);
@@ -877,7 +877,7 @@ int done=FALSE, argfound=FALSE,promptfound=FALSE;
else if (s1 && *s1) else if (s1 && *s1)
{ {
strcat(exec_args[0],s1); strcat(exec_args[0],s1);
if(argbuf) free(argbuf); if(argbuf) { free(argbuf); argbuf = NULL; }
done = TRUE; done = TRUE;
continue; continue;
} }
@@ -934,7 +934,7 @@ int done=FALSE, argfound=FALSE,promptfound=FALSE;
argfound = FALSE; argfound = FALSE;
s1=s2; s1=s2;
} }
if(argbuf) free(argbuf); if(argbuf) { free(argbuf); argbuf = NULL; }
return exec_args; return exec_args;
} }