summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-07-17 13:28:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-07-17 13:28:17 +0200
commit44699a0d15f57e3d9e1408dc802a78d286f7813d (patch)
tree99050e9919eef2a2a1eedeb48df805b780f0bfbe
parentb6d843ab50b4a84beebfc3474cc8b1b1dabc6f26 (diff)
downloadrsyslog-44699a0d15f57e3d9e1408dc802a78d286f7813d.tar.gz
rsyslog-44699a0d15f57e3d9e1408dc802a78d286f7813d.tar.bz2
rsyslog-44699a0d15f57e3d9e1408dc802a78d286f7813d.zip
bugfix: memory leak if disk queues were used and json data present
-rw-r--r--ChangeLog1
-rw-r--r--runtime/msg.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 16903c4e..ecb14fb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 7.4.3 [v7.4-stable] 2013-07-??
+- bugfix: memory leak if disk queues were used and json data present
- bugfix: CEE/json data was lost during disk queue operation
- bugfix: potential segfault during startup on invalid config
could happen if invalid actions were present, which could lead
diff --git a/runtime/msg.c b/runtime/msg.c
index 9d8bc0f6..a227567e 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1198,6 +1198,7 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
tokener = json_tokener_new();
pMsg->json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr),
cstrLen(pVar->val.pStr));
+ json_tokener_free(tokener);
reinitVar(pVar);
CHKiRet(objDeserializeProperty(pVar, pStrm));
}