PATCH: Coverity CID 1255827 Fix leak of prog in loadautofn()

Mikael Magnusson <[email protected]>
Newsgroups gmane.comp.shells.zsh.devel
Message-ID <[email protected]>
---
 Src/exec.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Src/exec.c b/Src/exec.c
index c640565e28..675245cae6 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -5730,16 +5730,17 @@ loadautofn(Shfunc shf, int fksh, int autol, int current_fpath)
 	    prog->flags |= EF_RUN;
 
 	    freeeprog(shf->funcdef);
-	    if (prog->flags & EF_MAP)
-		shf->funcdef = prog;
-	    else
+	    if (prog->flags & EF_HEAP)
 		shf->funcdef = dupeprog(prog, 0);
+	    else
+		shf->funcdef = prog;
 	    shf->node.flags &= ~PM_UNDEFINED;
 	    loadautofnsetfile(shf, fdir);
 	} else {
 	    VARARR(char, n, strlen(shf->node.nam) + 1);
 	    strcpy(n, shf->node.nam);
 	    execode(prog, 1, 0, "evalautofunc");
+	    freeeprog(prog);
 	    shf = (Shfunc) shfunctab->getnode(shfunctab, n);
 	    if (!shf || (shf->node.flags & PM_UNDEFINED)) {
 		/* We're not actually in the function; decrement locallevel */
@@ -5754,8 +5755,10 @@ loadautofn(Shfunc shf, int fksh, int autol, int current_fpath)
 	freeeprog(shf->funcdef);
 	if (prog->flags & EF_MAP)
 	    shf->funcdef = stripkshdef(prog, shf->node.nam);
-	else
+	else {
 	    shf->funcdef = dupeprog(stripkshdef(prog, shf->node.nam), 0);
+	    freeeprog(prog);
+	}
 	shf->node.flags &= ~PM_UNDEFINED;
 	loadautofnsetfile(shf, fdir);
     }
-- 
2.38.1
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.