summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-09 16:50:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-09 16:50:49 +0200
commitd090f525286377dbb25e977829e2bcbef1eb4ddf (patch)
treeb4e51943a00f7428a7aa3d70aed63a837dc96fb7
parentd5a3d4b3a7151906a4eec59ec20fc7c90cefde8c (diff)
parent848bd8f9d93c6913d8345b68637b66d2b6ea49d2 (diff)
downloadrsyslog-d090f525286377dbb25e977829e2bcbef1eb4ddf.tar.gz
rsyslog-d090f525286377dbb25e977829e2bcbef1eb4ddf.tar.xz
rsyslog-d090f525286377dbb25e977829e2bcbef1eb4ddf.zip
Merge branch 'v3-stable' into 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 05f080ea..db47f415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -837,6 +837,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);