diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 09:41:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 09:41:53 +0200 |
| commit | 98a94a68b677074c2061133eb273c3f66d65a8ce (patch) | |
| tree | 20d2c3babee63e08123b6652e6721d9e54754cfa /template.c | |
| parent | 2aa16d3b1ea39622dfc35eb3093ac4c4f4997710 (diff) | |
| parent | e1037b5b1fa7e31cc9182085899c65dadcba26da (diff) | |
| download | rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.tar.gz rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.tar.bz2 rsyslog-98a94a68b677074c2061133eb273c3f66d65a8ce.zip | |
Merge branch 'v6-devel'
Conflicts:
template.c
Diffstat (limited to 'template.c')
| -rw-r--r-- | template.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -320,10 +320,6 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson) rsRetVal localRet; DEFiRet; - assert(pTpl != NULL); - assert(pMsg != NULL); - assert(json != NULL); - if(pTpl->subtree != NULL){ localRet = jsonFind(pMsg, pTpl->subtree, pjson); if(*pjson == NULL) { @@ -1847,6 +1843,7 @@ tplProcessCnf(struct cnfobj *o) pTpl->optFormatEscape = JSON_ESCAPE; finalize_it: + free(tplStr); if(pvals != NULL) cnfparamvalsDestruct(pvals, &pblk); if(iRet != RS_RET_OK) { |