Merge branch 'master' into master-newtemplate

Conflicts:
	template.c

5 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0157652f..23eba26e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@ Version 7.3.0  [devel] 2012-10-09
   This was achieved by somewhat reducing the robustness of the zip archive.
   This is controlled by the new action parameter "VeryReliableZip".
 ---------------------------------------------------------------------------
+Version 7.1.10  [beta] 2012-10-11
+ - bugfix: m4 directory was not present in release tarball
+ - bugfix: small memory leak with string-type templates
+ - bugfix: small memory leak when template was specified in omfile
+ ---------------------------------------------------------------------------
 Version 7.1.9  [beta] 2012-10-09
 - bugfix: comments inside objects (e.g. action()) were not properly handled
 - bugfix: in (non)equal comparisons the position of arrays influenced result
diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h
index 8ff0d702..5cfce795 100644
--- a/grammar/rainerscript.h
+++ b/grammar/rainerscript.h
@@ -327,6 +327,7 @@ struct cnfstmt * cnfstmtNewLegaAct(char *actline);
 struct cnfstmt * cnfstmtNewSet(char *var, struct cnfexpr *expr);
 struct cnfstmt * cnfstmtNewUnset(char *var);
 struct cnfstmt * cnfstmtNewCall(es_str_t *name);
+struct cnfstmt * cnfstmtNewContinue(void);
 void cnfstmtDestruct(struct cnfstmt *root);
 void cnfstmtOptimize(struct cnfstmt *root);
 struct cnfarray* cnfarrayNew(es_str_t *val);
diff --git a/runtime/debug.c b/runtime/debug.c
index edc4a255..307a8bb8 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -927,12 +927,12 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg)
 		pszObjName = obj.GetName(pObj);
 	}
 
-//	pthread_mutex_lock(&mutdbgprint);
-//	pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint);
+	pthread_mutex_lock(&mutdbgprint);
+	pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint);
 
 	do_dbgprint(pszObjName, pszMsg, lenMsg);
 
-//	pthread_cleanup_pop(1);
+	pthread_cleanup_pop(1);
 }
 #pragma GCC diagnostic warning "-Wempty-body"
 
diff --git a/template.c b/template.c
index 2ef80f5b..4feb02fe 100644
--- a/template.c
+++ b/template.c
@@ -325,10 +325,6 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson, struct
 	rsRetVal localRet;
 	DEFiRet;
 
-	assert(pTpl != NULL);
-	assert(pMsg != NULL);
-	assert(pjson != NULL);
-
 	if(pTpl->subtree != NULL){
 		localRet = jsonFind(pMsg, pTpl->subtree, pjson);
 		if(*pjson == NULL) {
@@ -1884,6 +1880,7 @@ tplProcessCnf(struct cnfobj *o)
 		pTpl->optFormatEscape = JSON_ESCAPE;
 
 finalize_it:
+	free(tplStr);
 	if(pvals != NULL)
 		cnfparamvalsDestruct(pvals, &pblk);
 	if(iRet != RS_RET_OK) {
diff --git a/tools/omfile.c b/tools/omfile.c
index 2bb51e99..8969d16d 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -824,6 +824,7 @@ ENDcreateInstance
 
 BEGINfreeInstance
 CODESTARTfreeInstance
+	free(pData->tplName);
 	free(pData->f_fname);
 	if(pData->bDynamicName) {
 		dynaFileFreeCache(pData);