diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 10:18:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 10:18:28 +0200 |
| commit | b184158a6e54f15a048c1d1bcd27da4463e696a8 (patch) | |
| tree | cb5c85ea3c98cba86699112ed9a44c0582796631 /template.c | |
| parent | 398704183200adea592bf17059b3c443160efcf6 (diff) | |
| parent | 156382746626459aaf64d79eac95183d1ab60680 (diff) | |
| download | rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.tar.gz rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.tar.bz2 rsyslog-b184158a6e54f15a048c1d1bcd27da4463e696a8.zip | |
Merge branch 'master' into master-newtemplate
Conflicts:
template.c
Diffstat (limited to 'template.c')
| -rw-r--r-- | template.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -325,10 +325,6 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson, struct rsRetVal localRet; DEFiRet; - assert(pTpl != NULL); - assert(pMsg != NULL); - assert(pjson != NULL); - if(pTpl->subtree != NULL){ localRet = jsonFind(pMsg, pTpl->subtree, pjson); if(*pjson == NULL) { @@ -1884,6 +1880,7 @@ tplProcessCnf(struct cnfobj *o) pTpl->optFormatEscape = JSON_ESCAPE; finalize_it: + free(tplStr); if(pvals != NULL) cnfparamvalsDestruct(pvals, &pblk); if(iRet != RS_RET_OK) { |