diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/omhiredis/omhiredis.c | 5 | ||||
| -rw-r--r-- | template.c | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -9,6 +9,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 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 @@ -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); |