diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-10 13:57:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-10 13:57:34 +0200 |
| commit | 7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825 (patch) | |
| tree | df6ef116cdc6399671542977014f5c5e6a27386c | |
| parent | 6fde78cb744b22eb5790d43297acab249ca0e7fa (diff) | |
| parent | 6fff4ae3329e852586f3a14ac8b8369bc6d61148 (diff) | |
| download | rsyslog-7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825.tar.gz rsyslog-7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825.tar.xz rsyslog-7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825.zip | |
Merge branch 'v4-beta' into v4-devel
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/parser.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 4.5.1 [DEVEL] (rgerhards), 2009-07-?? +- bugfix: potential segfault when zip-compressed syslog records were + received (double free) - bugfix: properties inputname, fromhost, fromhost-ip, msg were lost when working with disk queues - performance enhancement: much faster, up to twice as fast (depending diff --git a/runtime/parser.c b/runtime/parser.c index a5183105..a2538fa3 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -115,7 +115,6 @@ static inline rsRetVal uncompressMessage(msg_t *pMsg) FINALIZE; /* unconditional exit, nothing left to do... */ } MsgSetRawMsg(pMsg, (char*)deflateBuf, iLenDefBuf); - free(deflateBuf); } finalize_it: if(deflateBuf != NULL) |