Merge branch 'v6-devel'

Conflicts:
	template.c

2 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ef3eb344..b817b729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@ Version 6.5.1  [devel] 2012-08-??
   used \x as escape where x was any character (e.g. "\n" meant "n" and NOT
   LF). This also means there is some incompatibility to v5 for well-know
   sequences. Better break it now than later.
+- bugfix: small memory leaks in template() statements
+  these were one-time memory leaks during startup, so they did NOT grow
+  during runtime
 ---------------------------------------------------------------------------
 Version 6.5.0  [devel] 2012-08-28
 - imrelp now supports non-cancel thread termination
diff --git a/template.c b/template.c
index 3cef586c..15d376a3 100644
--- a/template.c
+++ b/template.c
@@ -1256,7 +1256,7 @@ createConstantTpe(struct template *pTpl, struct cnfobj *o)
 	struct templateEntry *pTpe;
 	es_str_t *value;
 	int i;
-	struct cnfparamvals *pvals;
+	struct cnfparamvals *pvals = NULL;
 	uchar *outname = NULL;
 	DEFiRet;
 
@@ -1290,6 +1290,8 @@ createConstantTpe(struct template *pTpl, struct cnfobj *o)
 	pTpe->data.constant.pConstant = (uchar*)es_str2cstr(value, NULL);
 
 finalize_it:
+	if(pvals != NULL)
+		cnfparamvalsDestruct(pvals, &pblkConstant);
 	RETiRet;
 }
 
@@ -1310,7 +1312,7 @@ createPropertyTpe(struct template *pTpl, struct cnfobj *o)
 	int re_matchToUse = 0;
 	int re_submatchToUse = 0;
 	char *re_expr = NULL;
-	struct cnfparamvals *pvals;
+	struct cnfparamvals *pvals = NULL;
 	enum {F_NONE, F_CSV, F_JSON, F_JSONF} formatType = F_NONE;
 	enum {CC_NONE, CC_ESCAPE, CC_SPACE, CC_DROP} controlchr = CC_NONE;
 	enum {SP_NONE, SP_DROP, SP_REPLACE} secpath = SP_NONE;
@@ -1328,12 +1330,10 @@ createPropertyTpe(struct template *pTpl, struct cnfobj *o)
 		if(!pvals[i].bUsed)
 			continue;
 		if(!strcmp(pblkProperty.descr[i].name, "name")) {
-			char *tmp;
-
-			tmp = es_str2cstr(pvals[i].val.d.estr, NULL);
-			rsCStrConstructFromszStr(&name, (uchar*)tmp);
+			uchar *tmpstr = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+			rsCStrConstructFromszStr(&name, tmpstr);
 			cstrFinalize(name);
-			free(tmp);
+			free(tmpstr);
 		} else if(!strcmp(pblkProperty.descr[i].name, "droplastlf")) {
 			droplastlf = pvals[i].val.d.n;
 		} else if(!strcmp(pblkProperty.descr[i].name, "mandatory")) {
@@ -1622,7 +1622,7 @@ rsRetVal
 tplProcessCnf(struct cnfobj *o)
 {
 	struct template *pTpl = NULL;
-	struct cnfparamvals *pvals;
+	struct cnfparamvals *pvals = NULL;
 	int lenName;
 	char *name = NULL;
 	uchar *tplStr = NULL;