From b6d843ab50b4a84beebfc3474cc8b1b1dabc6f26 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Jul 2013 12:52:47 +0200 Subject: bugfix: CEE/json data was lost during disk queue operation --- runtime/msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/msg.c') diff --git a/runtime/msg.c b/runtime/msg.c index 9d5fa883..9d8bc0f6 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1113,7 +1113,6 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm) prop_t *propRcvFrom = NULL; prop_t *propRcvFromIP = NULL; struct json_tokener *tokener; - struct json_object *json; var_t *pVar = NULL; DEFiRet; @@ -1197,7 +1196,7 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm) } if(isProp("json")) { tokener = json_tokener_new(); - json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr), + pMsg->json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr), cstrLen(pVar->val.pStr)); reinitVar(pVar); CHKiRet(objDeserializeProperty(pVar, pStrm)); -- cgit v1.2.3 From 44699a0d15f57e3d9e1408dc802a78d286f7813d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Jul 2013 13:28:17 +0200 Subject: bugfix: memory leak if disk queues were used and json data present --- runtime/msg.c | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/msg.c') 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)); } -- cgit v1.2.3