diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-02 11:49:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-02 11:49:09 +0200 |
| commit | 4acff5da8bec4a7258e61e9de0cbd6ea08d6e1aa (patch) | |
| tree | a04ef1891b66e964bce6bc214e101140cc698537 | |
| parent | ed623752dda20002dc081ddb24e41473ae27dada (diff) | |
| parent | 80f88242982c9c6ad6ce8628fc5b94ea74051cf4 (diff) | |
| download | rsyslog-4acff5da8bec4a7258e61e9de0cbd6ea08d6e1aa.tar.gz rsyslog-4acff5da8bec4a7258e61e9de0cbd6ea08d6e1aa.tar.bz2 rsyslog-4acff5da8bec4a7258e61e9de0cbd6ea08d6e1aa.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -46,6 +46,9 @@ Version 7.4.2 [v7.4-stable] 2013-06-?? - bugfix: RainerScript object required parameters were not properly checked - this clould result to segfaults on startup if parameters were missing. +- bugfix: double-free in omelasticsearch + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=461 + Thanks to Marius Ionescu for providing a detailled bug report - bugfix: omrelp potential segfault at startup on invalid config parameters - bugfix: small memory leak when $uptime property was used - bugfix: potential segfault on rsyslog termination in imudp diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 33e58c1a..57abefdd 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -483,7 +483,6 @@ writeDataError(instanceData *pData, cJSON **pReplyRoot, uchar *reqmsg) DBGPRINTF("omelasticsearch: error %d writing error file, write returns %lld\n", errno, (long long) wrRet); } - free(rendered); cJSON_Delete(errRoot); *pReplyRoot = NULL; /* tell caller not to delete once again! */ |