From: mortenp <none@none>
Date: Tue, 16 Feb 2010 16:59:48 +0000 (+1100)
Subject: Fixed memory leak in substitute_one() (Ben Schmidt)
X-Git-Tag: RELEASE_1_2_17_1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=828f021f5b2e24ebc8cf4d218d77c0d33f86a90e;p=thirdparty%2Fmlmmj.git

Fixed memory leak in substitute_one() (Ben Schmidt)
---

diff --git a/ChangeLog b/ChangeLog
index 1ed75f63..9bcfa882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Fixed memory leak in substitute_one() (Ben Schmidt)
  o Updated German listtexts (Christoph Wilke)
  o Updated TUNABLES file (Ben Schmidt)
 1.2.17
diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index 6040c976..ae44701d 100644
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -145,10 +145,9 @@ char *substitute_one(const char *line, const char *listaddr,
 				value = concatstr(3, value, " ", str);
 				if(tmp)
 					myfree(tmp);
+				myfree(str);
 				count++;
 			}
-			if(str)
-				myfree(str);
 			close(mailfd);
 		}else{
 			log_error(LOG_ARGS, "Could not substitute $originalmail$ (mailname == %s)",mailname);