summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-09 16:51:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-09 16:51:24 +0200
commit60fa34f5ba588b654d99f6f2224e879b786317ee (patch)
tree7d0746d3b8ddf66d3ae3eb74b83b8406d5c743d1
parent25b0036fcb6ea54251fcb82e245366bbbaa71e58 (diff)
parentd090f525286377dbb25e977829e2bcbef1eb4ddf (diff)
downloadrsyslog-60fa34f5ba588b654d99f6f2224e879b786317ee.tar.gz
rsyslog-60fa34f5ba588b654d99f6f2224e879b786317ee.tar.xz
rsyslog-60fa34f5ba588b654d99f6f2224e879b786317ee.zip
Merge branch 'beta'
-rw-r--r--ChangeLog2
-rw-r--r--tools/omfile.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24442f8f..b061a56e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -948,6 +948,8 @@ Version 3.10.0 (rgerhards), 2008-01-07
mode
---------------------------------------------------------------------------
Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
+- bugfix: memory leaks in rsyslogd, primarily in singlethread mode
+ Thanks to Frederico Nunez for providing the fix
- bugfix: copy&paste error lead to dangling if - this caused a very minor
issue with re-formatting a RFC3164 date when the message was invalidly
formatted and had a colon immediately after the date. This was in the
diff --git a/tools/omfile.c b/tools/omfile.c
index 06875fe4..8144386f 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -296,6 +296,8 @@ int resolveFileSizeLimit(instanceData *pData)
execProg(pCmd, 1, pParams);
+ free(pCmd);
+
pData->fd = open((char*) pData->f_fname, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
pData->fCreateMode);