summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-15 14:08:42 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-15 14:08:42 +0200
commit8b8ac5e42c145174f0996df44bf3edd2132186ba (patch)
tree67c94021b8737504e69db6aae50bbe3df18e23ee
parentf7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff)
parent8f06095880c73adb5147b348a4bac428d4863169 (diff)
downloadrsyslog-8b8ac5e42c145174f0996df44bf3edd2132186ba.tar.gz
rsyslog-8b8ac5e42c145174f0996df44bf3edd2132186ba.tar.xz
rsyslog-8b8ac5e42c145174f0996df44bf3edd2132186ba.zip
Merge branch 'v4-devel' into beta
-rw-r--r--ChangeLog6
-rw-r--r--tools/syslogd.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a6d1d92..f5f3940d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
---------------------------------------------------------------------------
+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.
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 7f995e1c..3846e6a9 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -602,6 +602,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);