diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-17 19:32:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-17 19:32:11 +0200 |
| commit | 0f7622dd1f9a4b146324d432d421e46cdaa06c09 (patch) | |
| tree | d014226b96da8acc97af24e0bc939107b1c74bcf /runtime/msg.c | |
| parent | 1ea14f211ba0e7351c7da745a5411c7efdeb3cbd (diff) | |
| parent | 62090c416cd0b7f4b67a68a81b5c37e2d27cf84e (diff) | |
| download | rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.tar.gz rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.tar.bz2 rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 9d5fa883..a227567e 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,8 +1196,9 @@ 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)); + json_tokener_free(tokener); reinitVar(pVar); CHKiRet(objDeserializeProperty(pVar, pStrm)); } |