Merge branch 'v2-stable' into v3-stable

Conflicts:

	syslogd.c

2 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a457547..bbfbfd00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -670,6 +670,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/omfile.c b/omfile.c
index 6a53a723..0b16cd57 100644
--- a/omfile.c
+++ b/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);