diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 15 |
2 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 6.3.8 [DEVEL] 2012-02-?? +- bugfix: property $!all-json made rsyslog abort if not normalized data + were available - upgraded more plugins to support the new v6 config format: - ommysql - omlibdbi diff --git a/runtime/msg.c b/runtime/msg.c index 66911c16..92de1b9d 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2505,10 +2505,17 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, pRes = glbl.GetLocalHostName(); break; case PROP_CEE_ALL_JSON: - ee_fmtEventToJSON(pMsg->event, &str); - pRes = (uchar*) es_str2cstr(str, "#000"); - es_deleteStr(str); - *pbMustBeFreed = 1; /* all of these functions allocate dyn. memory */ + if(pMsg->event == NULL) { + if(*pbMustBeFreed == 1) + free(pRes); + pRes = (uchar*) ""; + *pbMustBeFreed = 0; + } else { + ee_fmtEventToJSON(pMsg->event, &str); + pRes = (uchar*) es_str2cstr(str, "#000"); + es_deleteStr(str); + *pbMustBeFreed = 1; /* all of these functions allocate dyn. memory */ + } break; case PROP_CEE: getCEEPropVal(pMsg, propName, &pRes, &bufLen, pbMustBeFreed); |