From f4ebd09b256d193eecd292bf7bc8bf97c7ffa995 Mon Sep 17 00:00:00 2001 From: Pavel Levshin Date: Fri, 8 Nov 2013 15:53:01 +0100 Subject: omhiredis: fix memory leak --- plugins/omhiredis/omhiredis.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c index 7a35bac2..757d5eb2 100644 --- a/plugins/omhiredis/omhiredis.c +++ b/plugins/omhiredis/omhiredis.c @@ -97,7 +97,6 @@ BEGINfreeInstance CODESTARTfreeInstance closeHiredis(pData); free(pData->server); - free(pData->tplName); ENDfreeInstance @@ -196,9 +195,9 @@ CODESTARTendTransaction for ( i = 0; i < pData->count; i++ ) { redisGetReply ( pData->conn, (void *)&pData->replies[i] ); /* TODO: add error checking here! */ - free ( pData->replies[i] ); + freeReplyObject ( pData->replies[i] ); } - freeReplyObject ( pData->replies ); + free ( pData->replies ); pData->count = 0; ENDendTransaction -- cgit v1.2.3 From 5a8ad4c9c2eaec406d9cd78d621c31d6dee8c08f Mon Sep 17 00:00:00 2001 From: Pavel Levshin Date: Fri, 8 Nov 2013 15:53:35 +0100 Subject: omhiredis: fix memory leak --- plugins/omhiredis/omhiredis.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c index 7a35bac2..757d5eb2 100644 --- a/plugins/omhiredis/omhiredis.c +++ b/plugins/omhiredis/omhiredis.c @@ -97,7 +97,6 @@ BEGINfreeInstance CODESTARTfreeInstance closeHiredis(pData); free(pData->server); - free(pData->tplName); ENDfreeInstance @@ -196,9 +195,9 @@ CODESTARTendTransaction for ( i = 0; i < pData->count; i++ ) { redisGetReply ( pData->conn, (void *)&pData->replies[i] ); /* TODO: add error checking here! */ - free ( pData->replies[i] ); + freeReplyObject ( pData->replies[i] ); } - freeReplyObject ( pData->replies ); + free ( pData->replies ); pData->count = 0; ENDendTransaction -- cgit v1.2.3 From 9c3a83f481d549eb85666c8bd2dea44e731990ef Mon Sep 17 00:00:00 2001 From: Pavel Levshin Date: Thu, 31 Oct 2013 23:47:32 +0400 Subject: bugfix: regression in template processing --- template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.c b/template.c index ebb3f422..e8b5e9f2 100644 --- a/template.c +++ b/template.c @@ -1794,7 +1794,7 @@ tplProcessCnf(struct cnfobj *o) } } - if(bHaveSubtree) { + if(!bHaveSubtree) { if(tplType == T_SUBTREE) { errmsg.LogError(0, RS_RET_ERR, "template '%s' of type subtree needs " "subtree parameter", name); -- cgit v1.2.3 From cab2279d5cd003138b32c5e1682ef6606e20ca5d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 8 Nov 2013 15:56:41 +0100 Subject: doc: maintain ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 102fee43..e5640b73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Version 7.5.7 [devel] 2013-11-?? - bugfix: ommysql lost configfile/section parameters after first close This means that when a connection was broken, it was probably re-instantiated with different parameters than configured. +- bugfix: regression in template processing with subtrees in templates + Thanks to Pavel Levshin for the fix - bugfix: regular worker threads are not properly (re)started if DA mode is active. This occurs only under rare conditions, but definitely is a bug that -- cgit v1.2.3