summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--tools/syslogd.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d24c086f..8ddfa647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,4 @@
---------------------------------------------------------------------------
-<<<<<<< HEAD:ChangeLog
Version 5.1.3 [DEVEL] (rgerhards), 2009-07-??
- enhance: UDP spoofing supported via new output module omudpspoof
See the omudpspoof documentation for details and samples
@@ -61,12 +60,15 @@ increase.
- increased ompgsql performance by adapting to new transactional
output module interface
---------------------------------------------------------------------------
-Version 4.5.1 [DEVEL] (rgerhards), 2009-07-??
-=======
+Version 4.5.2 [DEVEL] (rgerhards), 2009-07-??
+- bugfix: memory leak with some input modules. Those inputs that
+ use parseAndSubmitMsg() leak two small memory blocks with every message.
+ Typically, those process only relatively few messages, so the issue
+ does most probably not have any effect in practice.
+---------------------------------------------------------------------------
Version 4.5.1 [DEVEL] (rgerhards), 2009-07-15
- CONFIG CHANGE: $HUPisRestart default is now "off". We are doing this
to support removal of restart-type HUP in v5.
->>>>>>> f7894c401fdb8a2ad7bb3a1d87a74d438cc366c3:ChangeLog
- bugfix: fromhost-ip was sometimes truncated
- bugfix: potential segfault when zip-compressed syslog records were
received (double free)
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 804259d1..70fbeb81 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -604,6 +604,8 @@ static inline rsRetVal printline(uchar *hname, uchar *hnameIP, uchar *msg, int f
MsgSetRcvFromStr(pMsg, hname, ustrlen(hname), &propFromHost);
CHKiRet(MsgSetRcvFromIPStr(pMsg, hnameIP, ustrlen(hnameIP), &propFromHostIP));
MsgSetAfterPRIOffs(pMsg, p - msg);
+ prop.Destruct(&propFromHost);
+ prop.Destruct(&propFromHostIP);
logmsg(pMsg, flags);