summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-10 13:57:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-10 13:57:51 +0200
commitff9aa4483c2f7ee5fcc49de8f2045b1bef1ce139 (patch)
treea6a9f6d6831e7411bbf01da91bd190b480fdadb5
parent834f29da3909ad7f674488c47332652a741d47a7 (diff)
parent7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825 (diff)
downloadrsyslog-ff9aa4483c2f7ee5fcc49de8f2045b1bef1ce139.tar.gz
rsyslog-ff9aa4483c2f7ee5fcc49de8f2045b1bef1ce139.tar.xz
rsyslog-ff9aa4483c2f7ee5fcc49de8f2045b1bef1ce139.zip
Merge branch 'v4-devel'
-rw-r--r--ChangeLog2
-rw-r--r--runtime/parser.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b8a1433..97b87745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,8 @@ increase.
output module interface
---------------------------------------------------------------------------
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)