summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-26 12:29:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-26 12:29:08 +0200
commitd1589cd43978c700e2c88747e04d29c64a25d185 (patch)
tree768977702fbbc2eb0b847be947452a3b66aad0fc /runtime
parent3fd617f1acb7f1a057edb415cec1b144d210da81 (diff)
parent9a9282b86c785d7c0b67a0b546748e3591a487a2 (diff)
downloadrsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.tar.gz
rsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.tar.xz
rsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.zip
Merge branch 'v6-stable'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index 61c2f87b..44d36fef 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2734,7 +2734,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
if(pMsg->event == NULL) {
if(*pbMustBeFreed == 1)
free(pRes);
- pRes = (uchar*) "";
+ pRes = (uchar*) "{}";
*pbMustBeFreed = 0;
} else {
ee_fmtEventToJSON(pMsg->event, &str);