From ddcb7d9af0ed6641303be6001270b77a2b70257f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 15 Oct 2010 09:58:07 +0200
Subject: bugfix: imfile utilizes 32 bit to track offset

Most importantly, this problem can not experienced on recent Fedora
64 bit OS (which has 64 bit long's!)
---
 ChangeLog               | 5 +++++
 plugins/imfile/imfile.c | 5 ++++-
 runtime/stream.c        | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b16824d..5b9e8fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------
+Version 4.4.2a  [private build] (rgerhards), 2010-10-15
+- bugfix: imfile utilizes 32 bit to track offset. Most importantly,
+  this problem can not experienced on Fedora 64 bit OS (which has
+  64 bit long's!)
+---------------------------------------------------------------------------
 Version 4.4.2  [v4-stable] (rgerhards), 2009-10-09
 - bugfix: invalid handling of zero-sized messages, could lead to mis-
   addressing and potential memory corruption/segfault
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 927cb82e..1ae6e69a 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -349,12 +349,15 @@ persistStrmState(fileInfo_t *pInfo)
 {
 	DEFiRet;
 	strm_t *psSF = NULL; /* state file (stream) */
+	size_t lenDir;
 
 	ASSERT(pInfo != NULL);
 
 	/* TODO: create a function persistObj in obj.c? */
 	CHKiRet(strmConstruct(&psSF));
-	CHKiRet(strmSetDir(psSF, glbl.GetWorkDir(), strlen((char*)glbl.GetWorkDir())));
+	lenDir = strlen((char*)glbl.GetWorkDir());
+	if(lenDir > 0)
+		CHKiRet(strmSetDir(psSF, glbl.GetWorkDir(), lenDir));
 	CHKiRet(strmSettOperationsMode(psSF, STREAMMODE_WRITE));
 	CHKiRet(strmSetiAddtlOpenFlags(psSF, O_TRUNC));
 	CHKiRet(strmSetsType(psSF, STREAMTYPE_FILE_SINGLE));
diff --git a/runtime/stream.c b/runtime/stream.c
index 1cff2da6..267e8687 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -779,7 +779,7 @@ rsRetVal strmSerialize(strm_t *pThis, strm_t *pStrm)
 {
 	DEFiRet;
 	int i;
-	long l;
+	int64 l;
 
 	ISOBJ_TYPE_assert(pThis, strm);
 	ISOBJ_TYPE_assert(pStrm, strm);
@@ -801,8 +801,8 @@ rsRetVal strmSerialize(strm_t *pThis, strm_t *pStrm)
 	i = pThis->tOpenMode;
 	objSerializeSCALAR_VAR(pStrm, tOpenMode, INT, i);
 
-	l = (long) pThis->iCurrOffs;
-	objSerializeSCALAR_VAR(pStrm, iCurrOffs, LONG, l);
+	l = pThis->iCurrOffs;
+	objSerializeSCALAR_VAR(pStrm, iCurrOffs, INT64, l);
 
 	CHKiRet(obj.EndSerialize(pStrm));
 
-- 
cgit v1.2.3


From 205410c23ade6c7321fc984af26c3d2f590dc1aa Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 15 Oct 2010 06:37:58 -0700
Subject: bugfix: a couple of problems that imfile had on some platforms

namely Ubuntu (not their fault, but occured there)
---
 ChangeLog        |  2 ++
 runtime/stream.c | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b9e8fbc..7176d295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
 Version 4.4.2a  [private build] (rgerhards), 2010-10-15
+- bugfix: a couple of problems that imfile had on some platforms, namely
+  Ubuntu (not their fault, but occured there)
 - bugfix: imfile utilizes 32 bit to track offset. Most importantly,
   this problem can not experienced on Fedora 64 bit OS (which has
   64 bit long's!)
diff --git a/runtime/stream.c b/runtime/stream.c
index 267e8687..9997e685 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -96,10 +96,12 @@ static rsRetVal strmOpenFile(strm_t *pThis)
 
 	iFlags |= pThis->iAddtlOpenFlags;
 
-	pThis->fd = open((char*)pThis->pszCurrFName, iFlags, pThis->tOpenMode);
+	pThis->fd = open((char*)pThis->pszCurrFName, iFlags | O_LARGEFILE, pThis->tOpenMode);
 	if(pThis->fd == -1) {
 		int ierrnoSave = errno;
-		dbgoprint((obj_t*) pThis, "open error %d, file '%s'\n", errno, pThis->pszCurrFName);
+		char errmsg[1024];
+		dbgoprint((obj_t*) pThis, "open error %d, file '%s': %s\n", errno, pThis->pszCurrFName,
+			   rs_strerror_r(errno, errmsg, sizeof(errmsg)));
 		if(ierrnoSave == ENOENT)
 			ABORT_FINALIZE(RS_RET_FILE_NOT_FOUND);
 		else
@@ -522,7 +524,7 @@ rsRetVal strmFlush(strm_t *pThis)
  * is invalidated.
  * rgerhards, 2008-01-12
  */
-static rsRetVal strmSeek(strm_t *pThis, off_t offs)
+static rsRetVal strmSeek(strm_t *pThis, off64_t offs)
 {
 	DEFiRet;
 
@@ -532,9 +534,9 @@ static rsRetVal strmSeek(strm_t *pThis, off_t offs)
 		strmOpenFile(pThis);
 	else
 		strmFlush(pThis);
-	int i;
+	int64 i;
 	dbgoprint((obj_t*) pThis, "file %d seek, pos %ld\n", pThis->fd, (long) offs);
-	i = lseek(pThis->fd, offs, SEEK_SET); // TODO: check error!
+	i = lseek64(pThis->fd, offs, SEEK_SET);
 	pThis->iCurrOffs = offs; /* we are now at *this* offset */
 	pThis->iBufPtr = 0; /* buffer invalidated */
 
-- 
cgit v1.2.3


From d1846d8561fe5ecce13248b7b34333362d050c01 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 15 Oct 2010 11:23:03 +0200
Subject: patched version number

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 66a2d70d..7b4797aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[4.4.2],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.4.2a],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ChangeLog])
 AC_CONFIG_MACRO_DIR([m4])
-- 
cgit v1.2.3


From da8670d37a49ebda19dea708f716ad66a75f94e4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 24 Nov 2010 15:57:59 +0100
Subject: final preparations for release

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71f7aef0..5d25cd76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 4.6.5  [v4-stable] (rgerhards), 2010-??-??
+Version 4.6.5  [v4-stable] (rgerhards), 2010-11-24
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
   in a tight loop, effectively disabling functionality and bearing the
   risk of unresponsiveness of the whole system.
-- 
cgit v1.2.3


From c4026ec0f8d843540d01b07f94d4182d7dddb62e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 30 Nov 2010 11:41:40 +0100
Subject: preparing for 5.6.2

---
 ChangeLog       | 2 +-
 configure.ac    | 2 +-
 doc/manual.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ed424c9..ca13d489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-??
+Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-30
 - bugfix: compile failed on systems without epoll_create1()
   Thanks to David Hill for providing a fix.
 - bugfix: atomic increment for msg object may not work correct on all
diff --git a/configure.ac b/configure.ac
index afc83fb0..22365513 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[5.6.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.6.2],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 57461a0a..54a87cdc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 5.6.0 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.6.2 (beta branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
-- 
cgit v1.2.3


From d2dc913edc7bc4e0880f4dd6eb4aff495adb8138 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebel@debian.org>
Date: Tue, 30 Nov 2010 15:48:48 +0100
Subject: =?UTF-8?q?typo=20fix=20(thanks=20to=20Bj=C3=B6rn=20P=C3=A5hlsson?=
 =?UTF-8?q?=20for=20finding=20it!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
---
 doc/rsyslog_conf_filter.html | 4 ++--
 tools/rsyslog.conf.5         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/rsyslog_conf_filter.html b/doc/rsyslog_conf_filter.html
index 63c29817..34839616 100644
--- a/doc/rsyslog_conf_filter.html
+++ b/doc/rsyslog_conf_filter.html
@@ -85,12 +85,12 @@ selector field is capable to overwrite the preceding ones. Using this
 behavior you can exclude some priorities from the pattern.</p>
 <p>Rsyslogd has a syntax extension to the original BSD source,
 that makes its use more intuitively. You may precede every priority
-with an equation sign ("='') to specify only this single priority and
+with an equals sign ("='') to specify only this single priority and
 not any of the above. You may also (both is valid, too) precede the
 priority with an exclamation mark ("!'') to ignore all that
 priorities, either exact this one or this and any higher priority. If
 you use both extensions than the exclamation mark must occur before the
-equation sign, just use it intuitively.</p>
+equals sign, just use it intuitively.</p>
 <h3>Property-Based Filters</h3>
 <p>Property-based filters are unique to rsyslogd. They allow to
 filter on any property, like HOSTNAME, syslogtag and msg. A list of all
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5
index e8a4ab92..e17da974 100644
--- a/tools/rsyslog.conf.5
+++ b/tools/rsyslog.conf.5
@@ -200,11 +200,11 @@ to overwrite the preceding ones. Using this behavior you can exclude some
 priorities from the pattern.
 
 Rsyslogd has a syntax extension to the original BSD source, that makes its use
-more intuitively. You may precede every priority with an equation sign ('=') to
+more intuitively. You may precede every priority with an equals sign ('=') to
 specify only this single priority and not any of the above. You may also (both
 is valid, too) precede the priority with an exclamation mark ('!') to ignore
 all that priorities, either exact this one or this and any higher priority. If
-you use both extensions than the exclamation mark must occur before the equation
+you use both extensions than the exclamation mark must occur before the equals
 sign, just use it intuitively.
 
 .SH ACTIONS
-- 
cgit v1.2.3


From 7817aa1597384fce7ac643e56ee56f47d3c5d37d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 12:02:36 +0100
Subject: bugfix: unitialized variable could cause issues under extreme
 conditions

plus some minor nits. This was found after a clang static code analyzer
analysis (great tool, and special thanks to Marcin for telling me about
it!)
---
 ChangeLog                     |  6 ++++++
 plugins/omtesting/omtesting.c |  2 ++
 runtime/conf.c                |  7 ++++++-
 runtime/ctok.c                |  2 +-
 template.c                    | 10 ++++------
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca13d489..112ef50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------
+Version 5.6.3  [V5-STABLE] (rgerhards), 2010-12-??
+- bugfix: unitialized variable could cause issues under extreme conditions
+  plus some minor nits. This was found after a clang static code analyzer
+  analysis (great tool, and special thanks to Marcin for telling me about
+  it!)
+---------------------------------------------------------------------------
 Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-30
 - bugfix: compile failed on systems without epoll_create1()
   Thanks to David Hill for providing a fix.
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c
index 9442f691..c474bb41 100644
--- a/plugins/omtesting/omtesting.c
+++ b/plugins/omtesting/omtesting.c
@@ -188,8 +188,10 @@ CODESTARTdoAction
 			break;
 		case MD_RANDFAIL:
 			iRet = doRandFail();
+			break;
 		case MD_ALWAYS_SUSPEND:
 			iRet = RS_RET_SUSPENDED;
+			break;
 	}
 
 	if(iRet == RS_RET_OK && pData->bEchoStdout) {
diff --git a/runtime/conf.c b/runtime/conf.c
index d41f2950..529142ed 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -1084,7 +1084,7 @@ static rsRetVal cflineDoAction(uchar **p, action_t **ppAction)
 	DEFiRet;
 	modInfo_t *pMod;
 	omodStringRequest_t *pOMSR;
-	action_t *pAction;
+	action_t *pAction = NULL;
 	void *pModData;
 
 	ASSERT(p != NULL);
@@ -1092,6 +1092,11 @@ static rsRetVal cflineDoAction(uchar **p, action_t **ppAction)
 
 	/* loop through all modules and see if one picks up the line */
 	pMod = module.GetNxtType(NULL, eMOD_OUT);
+	/* Note: clang static analyzer reports that pMod mybe == NULL. However, this is
+	 * not possible, because we have the built-in output modules which are always
+	 * present. Anyhow, we guard this by an assert. -- rgerhards, 2010-12-16
+	 */
+	assert(pMod != NULL);
 	while(pMod != NULL) {
 		pOMSR = NULL;
 		iRet = pMod->mod.om.parseSelectorAct(p, &pModData, &pOMSR);
diff --git a/runtime/ctok.c b/runtime/ctok.c
index 18ddaed2..a17d0ec9 100644
--- a/runtime/ctok.c
+++ b/runtime/ctok.c
@@ -267,7 +267,7 @@ ctokGetVar(ctok_t *pThis, ctok_token_t *pToken)
 {
 	DEFiRet;
 	uchar c;
-	cstr_t *pstrVal;
+	cstr_t *pstrVal = NULL;
 
 	ISOBJ_TYPE_assert(pThis, ctok);
 	ASSERT(pToken != NULL);
diff --git a/template.c b/template.c
index 06949e45..5aaf1bcb 100644
--- a/template.c
+++ b/template.c
@@ -86,9 +86,9 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
 	DEFiRet;
 	struct templateEntry *pTpe;
 	size_t iBuf;
-	unsigned short bMustBeFreed;
+	unsigned short bMustBeFreed = 0;
 	uchar *pVal;
-	size_t iLenVal;
+	size_t iLenVal = 0;
 
 	assert(pTpl != NULL);
 	assert(pMsg != NULL);
@@ -1046,7 +1046,6 @@ void tplDeleteAll(void)
 {
 	struct template *pTpl, *pTplDel;
 	struct templateEntry *pTpe, *pTpeDel;
-	rsRetVal iRetLocal;
 	BEGINfunc
 
 	pTpl = tplRoot;
@@ -1069,7 +1068,7 @@ void tplDeleteAll(void)
 			case FIELD:
 				/* check if we have a regexp and, if so, delete it */
 				if(pTpeDel->data.field.has_regex != 0) {
-					if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+					if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 						regexp.regfree(&(pTpeDel->data.field.re));
 					}
 				}
@@ -1095,7 +1094,6 @@ void tplDeleteNew(void)
 {
 	struct template *pTpl, *pTplDel;
 	struct templateEntry *pTpe, *pTpeDel;
-	rsRetVal iRetLocal;
 
 	BEGINfunc
 
@@ -1124,7 +1122,7 @@ void tplDeleteNew(void)
 			case FIELD:
 				/* check if we have a regexp and, if so, delete it */
 				if(pTpeDel->data.field.has_regex != 0) {
-					if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+					if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 						regexp.regfree(&(pTpeDel->data.field.re));
 					}
 				}
-- 
cgit v1.2.3


From ec6230cffe6e06957113d53272d00dc859a3e617 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 12:16:54 +0100
Subject: improved some code based on clang static analyzer results

---
 ChangeLog      | 3 +++
 runtime/conf.c | 2 +-
 runtime/ctok.c | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e17ef35d..a50c4ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------
+Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- improved some code based on clang static analyzer results
+---------------------------------------------------------------------------
 Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
   in a tight loop, effectively disabling functionality and bearing the
diff --git a/runtime/conf.c b/runtime/conf.c
index 001b501d..efe9c516 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -1054,7 +1054,7 @@ static rsRetVal cflineDoAction(uchar **p, action_t **ppAction)
 	DEFiRet;
 	modInfo_t *pMod;
 	omodStringRequest_t *pOMSR;
-	action_t *pAction;
+	action_t *pAction = NULL;
 	void *pModData;
 
 	ASSERT(p != NULL);
diff --git a/runtime/ctok.c b/runtime/ctok.c
index 71a10a20..7dd5f8b0 100644
--- a/runtime/ctok.c
+++ b/runtime/ctok.c
@@ -1,4 +1,4 @@
-/* cfgtok.c - helper class to tokenize an input stream - which surprisingly
+/* ctok.c - helper class to tokenize an input stream - which surprisingly
  * currently does not work with streams but with string. But that will
  * probably change over time ;) This class was originally written to support
  * the expression module but may evolve when (if) the expression module is
@@ -267,7 +267,7 @@ ctokGetVar(ctok_t *pThis, ctok_token_t *pToken)
 {
 	DEFiRet;
 	uchar c;
-	cstr_t *pstrVal;
+	cstr_t *pstrVal = NULL;
 
 	ISOBJ_TYPE_assert(pThis, ctok);
 	ASSERT(pToken != NULL);
-- 
cgit v1.2.3


From 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 12:57:55 +0100
Subject: some cleanup based on clang static analyzer results

---
 ChangeLog             |  4 ++++
 plugins/imklog/ksym.c |  4 +---
 runtime/cfsysline.c   |  4 ++--
 runtime/debug.c       |  6 ++----
 runtime/msg.c         |  4 +---
 runtime/parser.c      |  2 --
 runtime/queue.c       |  5 ++---
 runtime/wtp.c         |  2 +-
 template.c            | 10 ++++------
 threads.c             |  3 +--
 tools/omfile.c        |  1 -
 tools/omfwd.c         |  2 --
 tools/omusrmsg.c      |  1 -
 tools/syslogd.c       |  2 --
 14 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 731939d8..3c7d3c4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Version 4.6.6  [v4-stable] (rgerhards), 2010-11-??
 - bugfix: imfile utilizes 32 bit to track offset. Most importantly,
   this problem can not experienced on Fedora 64 bit OS (which has
   64 bit long's!)
+- some improvements thanks to clang's static code analyzer
+  o overall cleanup (mostly unnecessary writes and otherwise unused stuff)
+  o bugfix: fixed a very remote problem in msg.c which could occur when
+    running under extremely low memory conditions
 ---------------------------------------------------------------------------
 Version 4.6.5  [v4-stable] (rgerhards), 2010-11-24
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
diff --git a/plugins/imklog/ksym.c b/plugins/imklog/ksym.c
index f636a7bb..ca708ba6 100644
--- a/plugins/imklog/ksym.c
+++ b/plugins/imklog/ksym.c
@@ -650,8 +650,7 @@ static void FreeSymbols(void)
  **************************************************************************/
 extern char *ExpandKadds(char *line, char *el)
 {
-	auto char	dlm,
-			*kp,
+	auto char	*kp,
 			*sl = line,
 			*elp = el,
 			*symbol;
@@ -781,7 +780,6 @@ extern char *ExpandKadds(char *line, char *el)
 			strcpy(el, sl);
 			return(el);
 		}
-		dlm = *kp;
 		strncpy(num,sl+1,kp-sl-1);
 		num[kp-sl-1] = '\0';
 		value = strtoul(num, (char **) 0, 16);
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index 469fbfc2..1dd5905e 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -961,11 +961,11 @@ void dbgPrintCfSysLineHandlers(void)
 
 	dbgprintf("Sytem Line Configuration Commands:\n");
 	llCookieCmd = NULL;
-	while((iRet = llGetNextElt(&llCmdList, &llCookieCmd, (void*)&pCmd)) == RS_RET_OK) {
+	while(llGetNextElt(&llCmdList, &llCookieCmd, (void*)&pCmd) == RS_RET_OK) {
 		llGetKey(llCookieCmd, (void*) &pKey); /* TODO: using the cookie is NOT clean! */
 		dbgprintf("\tCommand '%s':\n", pKey);
 		llCookieCmdHdlr = NULL;
-		while((iRet = llGetNextElt(&pCmd->llCmdHdlrs, &llCookieCmdHdlr, (void*)&pCmdHdlr)) == RS_RET_OK) {
+		while(llGetNextElt(&pCmd->llCmdHdlrs, &llCookieCmdHdlr, (void*)&pCmdHdlr) == RS_RET_OK) {
 			dbgprintf("\t\ttype : %d\n", pCmdHdlr->eType);
 			dbgprintf("\t\tpData: 0x%lx\n", (unsigned long) pCmdHdlr->pData);
 			dbgprintf("\t\tHdlr : 0x%lx\n", (unsigned long) pCmdHdlr->cslCmdHdlr);
diff --git a/runtime/debug.c b/runtime/debug.c
index 9b7c2952..6bb8d743 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -433,14 +433,13 @@ dbgMutLog_t *dbgMutLogFindHolder(pthread_mutex_t *pmut)
 static inline void dbgMutexPreLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB, int ln)
 {
 	dbgMutLog_t *pHolder;
-	dbgMutLog_t *pLog;
 	char pszBuf[128];
 	char pszHolderThrdName[64];
 	char *pszHolder;
 
 	pthread_mutex_lock(&mutMutLog);
 	pHolder = dbgMutLogFindHolder(pmut);
-	pLog = dbgMutLogAddEntry(pmut, MUTOP_LOCKWAIT, pFuncDB, ln);
+	dbgMutLogAddEntry(pmut, MUTOP_LOCKWAIT, pFuncDB, ln);
 
 	if(pHolder == NULL)
 		pszHolder = "[NONE]";
@@ -481,14 +480,13 @@ static inline void dbgMutexLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB,
 static inline void dbgMutexPreTryLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB, int ln)
 {
    dbgMutLog_t *pHolder;
-   dbgMutLog_t *pLog;
    char pszBuf[128];
    char pszHolderThrdName[64];
    char *pszHolder;
 
    pthread_mutex_lock(&mutMutLog);
    pHolder = dbgMutLogFindHolder(pmut);
-   pLog = dbgMutLogAddEntry(pmut, MUTOP_TRYLOCK, pFuncDB, ln);
+   dbgMutLogAddEntry(pmut, MUTOP_TRYLOCK, pFuncDB, ln);
 
    if(pHolder == NULL)
       pszHolder = "[NONE]";
diff --git a/runtime/msg.c b/runtime/msg.c
index f5041b85..a9a09143 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1476,7 +1476,7 @@ rsRetVal MsgSetPROCID(msg_t *pMsg, char* pszPROCID)
 		CHKiRet(cstrConstruct(&pMsg->pCSPROCID));
 	}
 	/* if we reach this point, we have the object */
-	iRet = rsCStrSetSzStr(pMsg->pCSPROCID, (uchar*) pszPROCID);
+	CHKiRet(rsCStrSetSzStr(pMsg->pCSPROCID, (uchar*) pszPROCID));
 	CHKiRet(cstrFinalize(pMsg->pCSPROCID));
 
 finalize_it:
@@ -2872,7 +2872,6 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 	if(pTpe->data.field.options.bCSV) {
 		/* we need to obtain a private copy, as we need to at least add the double quotes */
 		int iBufLen;
-		int i;
 		uchar *pBStart;
 		uchar *pDst;
 		uchar *pSrc;
@@ -2887,7 +2886,6 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			RET_OUT_OF_MEMORY;
 		}
 		pSrc = pRes;
-		i = 0;
 		*pDst++ = '"'; /* starting quote */
 		while(*pSrc) {
 			if(*pSrc == '"')
diff --git a/runtime/parser.c b/runtime/parser.c
index 36e88ebd..d27f3e38 100644
--- a/runtime/parser.c
+++ b/runtime/parser.c
@@ -272,7 +272,6 @@ rsRetVal parseMsg(msg_t *pMsg)
 	uchar *msg;
 	int pri;
 	int lenMsg;
-	int iPriText;
 
 	if(pMsg->iLenRawMsg == 0)
 		ABORT_FINALIZE(RS_RET_EMPTY_MSG);
@@ -286,7 +285,6 @@ rsRetVal parseMsg(msg_t *pMsg)
 	lenMsg = pMsg->iLenRawMsg;
 	msg = pMsg->pszRawMsg;
 	pri = DEFUPRI;
-	iPriText = 0;
 	if(*msg == '<') {
 		/* while we process the PRI, we also fill the PRI textual representation
 		 * inside the msg object. This may not be ideal from an OOP point of view,
diff --git a/runtime/queue.c b/runtime/queue.c
index 9d7a9058..39898718 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -685,7 +685,6 @@ qqueueHaveQIF(qqueue_t *pThis)
 {
 	DEFiRet;
 	uchar pszQIFNam[MAXFNAME];
-	size_t lenQIFNam;
 	struct stat stat_buf;
 
 	ISOBJ_TYPE_assert(pThis, qqueue);
@@ -694,8 +693,8 @@ qqueueHaveQIF(qqueue_t *pThis)
 		ABORT_FINALIZE(RS_RET_NO_FILEPREFIX);
 
 	/* Construct file name */
-	lenQIFNam = snprintf((char*)pszQIFNam, sizeof(pszQIFNam) / sizeof(uchar), "%s/%s.qi",
-			     (char*) glbl.GetWorkDir(), (char*)pThis->pszFilePrefix);
+	snprintf((char*)pszQIFNam, sizeof(pszQIFNam) / sizeof(uchar), "%s/%s.qi",
+	         (char*) glbl.GetWorkDir(), (char*)pThis->pszFilePrefix);
 
 	/* check if the file exists */
 	if(stat((char*) pszQIFNam, &stat_buf) == -1) {
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 0c66dd11..f71d5855 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -460,7 +460,7 @@ wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in
 	do {
 		END_MTX_PROTECTED_OPERATIONS(&pThis->mut);
 
-		iRet = wtiWorker(pWti); /* just to make sure: this is NOT protected by the mutex! */
+		wtiWorker(pWti); /* just to make sure: this is NOT protected by the mutex! */
 
 		BEGIN_MTX_PROTECTED_OPERATIONS(&pThis->mut, LOCK_MUTEX);
 	} while(pThis->iCurNumWrkThrd == 1 && pThis->bInactivityGuard == 1);
diff --git a/template.c b/template.c
index 68c57be1..a5331d57 100644
--- a/template.c
+++ b/template.c
@@ -82,9 +82,9 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
 	DEFiRet;
 	struct templateEntry *pTpe;
 	int iBuf;
-	unsigned short bMustBeFreed;
+	unsigned short bMustBeFreed = 0;
 	uchar *pVal;
-	size_t iLenVal;
+	size_t iLenVal = 0;
 
 	assert(pTpl != NULL);
 	assert(pMsg != NULL);
@@ -980,7 +980,6 @@ void tplDeleteAll(void)
 {
 	struct template *pTpl, *pTplDel;
 	struct templateEntry *pTpe, *pTpeDel;
-	rsRetVal iRetLocal;
 	BEGINfunc
 
 	pTpl = tplRoot;
@@ -1003,7 +1002,7 @@ void tplDeleteAll(void)
 			case FIELD:
 				/* check if we have a regexp and, if so, delete it */
 				if(pTpeDel->data.field.has_regex != 0) {
-					if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+					if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 						regexp.regfree(&(pTpeDel->data.field.re));
 					}
 				}
@@ -1029,7 +1028,6 @@ void tplDeleteNew(void)
 {
 	struct template *pTpl, *pTplDel;
 	struct templateEntry *pTpe, *pTpeDel;
-	rsRetVal iRetLocal;
 
 	BEGINfunc
 
@@ -1058,7 +1056,7 @@ void tplDeleteNew(void)
 			case FIELD:
 				/* check if we have a regexp and, if so, delete it */
 				if(pTpeDel->data.field.has_regex != 0) {
-					if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+					if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 						regexp.regfree(&(pTpeDel->data.field.re));
 					}
 				}
diff --git a/threads.c b/threads.c
index 13222694..051903de 100644
--- a/threads.c
+++ b/threads.c
@@ -151,7 +151,6 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI
 {
 	DEFiRet;
 	thrdInfo_t *pThis;
-	int i;
 
 	assert(thrdMain != NULL);
 
@@ -159,7 +158,7 @@ rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdI
 	pThis->bIsActive = 1;
 	pThis->pUsrThrdMain = thrdMain;
 	pThis->pAfterRun = afterRun;
-	i = pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis);
+	pthread_create(&pThis->thrdID, NULL, thrdStarter, pThis);
 	CHKiRet(llAppend(&llThrds, NULL, pThis));
 
 finalize_it:
diff --git a/tools/omfile.c b/tools/omfile.c
index 24de052c..487cf8a0 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -353,7 +353,6 @@ prepareFile(instanceData *pData, uchar *newFileName)
 
 	if(access((char*)newFileName, F_OK) != 0) {
 		/* file does not exist, create it (and eventually parent directories */
-		fd = -1;
 		if(pData->bCreateDirs) {
 			/* We first need to create parent dirs if they are missing.
 			 * We do not report any errors here ourselfs but let the code
diff --git a/tools/omfwd.c b/tools/omfwd.c
index cbfc36a4..96b365a0 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -515,7 +515,6 @@ finalize_it:
 BEGINparseSelectorAct
 	uchar *q;
 	int i;
-	int bErr;
 	rsRetVal localRet;
         struct addrinfo;
 	TCPFRAMINGMODE tcp_framing = TCP_FRAMING_OCTET_STUFFING;
@@ -638,7 +637,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	}
 	
 	/* now skip to template */
-	bErr = 0;
 	while(*p && *p != ';'  && *p != '#' && !isspace((int) *p))
 		++p; /*JUST SKIP*/
 
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index e61751dc..768baca7 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -249,7 +249,6 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
 				}
 			}
 			close(ttyf);
-			ttyf = -1;
 		}
 	}
 
diff --git a/tools/syslogd.c b/tools/syslogd.c
index a03dcf0e..12d94e9a 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1190,7 +1190,6 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
 {
 	uchar *p2parse;
 	int lenMsg;
-	int bTAGCharDetected;
 	int i;	/* general index for parsing */
 	uchar bufParseTAG[CONF_TAG_MAXSIZE];
 	uchar bufParseHOSTNAME[CONF_HOSTNAME_MAXSIZE];
@@ -1251,7 +1250,6 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
 		 * rgerhards, 2009-06-23: and I now have extended this logic to every character
 		 * that is not a valid hostname.
 		 */
-		bTAGCharDetected = 0;
 		if(lenMsg > 0 && flags & PARSE_HOSTNAME) {
 			i = 0;
 			while(i < lenMsg && (isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.'
-- 
cgit v1.2.3


From c5611012f9d82155d6017435b5cf52c0b4e31149 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 13:41:18 +0100
Subject: fixed cosmetic nit (as a result of clang static code analyzer run)

---
 tools/syslogd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/syslogd.c b/tools/syslogd.c
index 2e4ea5d5..ffcaa27f 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2590,7 +2590,7 @@ int realMain(int argc, char **argv)
 		}
 	}
 
-	if ((argc -= optind))
+	if(argc - optind)
 		usage();
 
 	DBGPRINTF("rsyslogd %s startup, compatibility mode %d, module path '%s', cwd:%s\n",
-- 
cgit v1.2.3


From b9ba5013ad39dbf60a0a3bc06c38870a803451fd Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 14:23:38 +0100
Subject: bugfix: batch processing flagged invalid message as "bad" under some
 circumstances

also fixed some cosmetic nits
---
 ChangeLog           | 6 +++---
 action.c            | 4 ++--
 runtime/cfsysline.c | 3 ---
 runtime/debug.c     | 8 +++-----
 runtime/queue.c     | 2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 533557a7..cfbee998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------
-<<<<<<< HEAD
 Version 5.6.3  [V5-STABLE] (rgerhards), 2010-12-??
+- bugfix: batch processing flagged invalid message as "bad" under some
+  circumstances
 - bugfix: unitialized variable could cause issues under extreme conditions
   plus some minor nits. This was found after a clang static code analyzer
   analysis (great tool, and special thanks to Marcin for telling me about
@@ -585,9 +586,8 @@ Version 4.6.5  [v4-stable] (rgerhards), 2010-??-??
   in a tight loop, effectively disabling functionality and bearing the
   risk of unresponsiveness of the whole system.
   Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
-=======
+---------------------------------------------------------------------------
 Version 4.6.6  [v4-stable] (rgerhards), 2010-11-??
->>>>>>> 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329
 - bugfix: a couple of problems that imfile had on some platforms, namely
   Ubuntu (not their fault, but occured there)
 - bugfix: imfile utilizes 32 bit to track offset. Most importantly,
diff --git a/action.c b/action.c
index 0d298673..9591c393 100644
--- a/action.c
+++ b/action.c
@@ -971,7 +971,7 @@ submitBatch(action_t *pAction, batch_t *pBatch, int nElem)
 			; /* do nothing, this will retry the full batch */
 		} else if(localRet == RS_RET_ACTION_FAILED) {
 			/* in this case, everything not yet committed is BAD */
-			for(i = pBatch->iDoneUpTo ; i < nElem ; ++i) {
+			for(i = pBatch->iDoneUpTo ; i < pBatch->iDoneUpTo + nElem ; ++i) {
 				if(   pBatch->pElem[i].state != BATCH_STATE_DISC
 				   && pBatch->pElem[i].state != BATCH_STATE_COMM ) {
 					pBatch->pElem[i].state = BATCH_STATE_BAD;
@@ -981,7 +981,7 @@ submitBatch(action_t *pAction, batch_t *pBatch, int nElem)
 			bDone = 1;
 		} else {
 			if(nElem == 1) {
-				batchSetElemState(pBatch, i, BATCH_STATE_BAD);
+				batchSetElemState(pBatch, pBatch->iDoneUpTo, BATCH_STATE_BAD);
 				bDone = 1;
 			} else {
 				/* retry with half as much. Depth is log_2 batchsize, so recursion is not too deep */
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index 5ab73184..037e9f84 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -953,8 +953,6 @@ finalize_it:
  */
 void dbgPrintCfSysLineHandlers(void)
 {
-	DEFiRet;
-
 	cslCmd_t *pCmd;
 	cslCmdHdlr_t *pCmdHdlr;
 	linkedListCookie_t llCookieCmd;
@@ -976,7 +974,6 @@ void dbgPrintCfSysLineHandlers(void)
 		}
 	}
 	dbgprintf("\n");
-	ENDfunc
 }
 
 
diff --git a/runtime/debug.c b/runtime/debug.c
index c69a0296..bfc57071 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -157,9 +157,7 @@ static pthread_key_t keyCallStack;
  */
 static void dbgMutexCancelCleanupHdlr(void *pmut)
 {
-	int ret;
-	ret = pthread_mutex_unlock((pthread_mutex_t*) pmut);
-	assert(ret == 0);
+	pthread_mutex_unlock((pthread_mutex_t*) pmut);
 }
 
 
@@ -473,7 +471,7 @@ static inline void dbgMutexLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB,
 	dbgMutLogDelEntry(pLog);
 
 	/* add "lock" entry */
-	pLog = dbgMutLogAddEntry(pmut, MUTOP_LOCK, pFuncDB, lockLn);
+	dbgMutLogAddEntry(pmut, MUTOP_LOCK, pFuncDB, lockLn);
 	dbgFuncDBAddMutexLock(pFuncDB, pmut, lockLn);
 	pthread_mutex_unlock(&mutMutLog);
 	if(bPrintMutexAction)
@@ -520,7 +518,7 @@ static inline void dbgMutexTryLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncD
    dbgMutLogDelEntry(pLog);
 
    /* add "lock" entry */
-   pLog = dbgMutLogAddEntry(pmut, MUTOP_LOCK, pFuncDB, lockLn);
+   dbgMutLogAddEntry(pmut, MUTOP_LOCK, pFuncDB, lockLn);
    dbgFuncDBAddMutexLock(pFuncDB, pmut, lockLn);
    pthread_mutex_unlock(&mutMutLog);
    if(bPrintMutexAction)
diff --git a/runtime/queue.c b/runtime/queue.c
index 60d17086..c2806ca1 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1129,7 +1129,7 @@ cancelWorkers(qqueue_t *pThis)
 		 * done when *no* worker is running. So time for a shutdown... -- rgerhards, 2009-05-28
 		 */
 		DBGOPRINT((obj_t*) pThis, "checking to see if main queue DA worker pool needs to be cancelled\n");
-		iRetLocal = wtpCancelAll(pThis->pWtpDA); /* returns immediately if all threads already have terminated */
+		wtpCancelAll(pThis->pWtpDA); /* returns immediately if all threads already have terminated */
 	}
 
 	RETiRet;
-- 
cgit v1.2.3


From c12fd1e65b0403ca60bf51cfc8b5ba487457f731 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 16 Dec 2010 15:52:15 +0100
Subject: used a bit more stack (irrelevant) to gain a bit more performance...

... for large batches
---
 action.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/action.c b/action.c
index 9591c393..48ed8880 100644
--- a/action.c
+++ b/action.c
@@ -1360,7 +1360,7 @@ doSubmitToActionQNotAllMarkBatch(action_t *pAction, batch_t *pBatch)
 	int i;
 	int bProcessMarkMsgs = 0;
 	int bModifiedFilter;
-	sbool FilterSave[128];
+	sbool FilterSave[1024];
 	sbool *pFilterSave;
 	DEFiRet;
 
@@ -1405,6 +1405,7 @@ doSubmitToActionQNotAllMarkBatch(action_t *pAction, batch_t *pBatch)
 	if(bModifiedFilter) {
 		/* in this case, we need to restore previous state */
 		for(i = 0 ; i < batchNumMsgs(pBatch) ; ++i) {
+			/* note: clang static code analyzer reports a false positive below */
 			pBatch->pElem[i].bFilterOK = pFilterSave[i];
 		}
 	}
-- 
cgit v1.2.3


From 2181515805e65c37b9db5e0badef2a0a86164234 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 17 Dec 2010 10:43:55 +0100
Subject: bug fixes in action processing

- bugfix: action processor released mememory too early, resulting in
  potential issue in retry cases (but very unlikely due to another
  bug, which I also fixed -- only after the fix this problem here
  became actually visible).
- bugfix: batches which had actions in error were not properly retried in
  all cases
---
 ChangeLog       |   6 +++
 action.c        | 119 +++++++++++++++++++++++++++++++++-----------------------
 runtime/batch.h |  11 ++++--
 3 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfbee998..aee5603d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
 ---------------------------------------------------------------------------
 Version 5.6.3  [V5-STABLE] (rgerhards), 2010-12-??
+- bugfix: action processor released mememory too early, resulting in
+  potential issue in retry cases (but very unlikely due to another
+  bug, which I also fixed -- only after the fix this problem here
+  became actually visible).
 - bugfix: batch processing flagged invalid message as "bad" under some
   circumstances
 - bugfix: unitialized variable could cause issues under extreme conditions
   plus some minor nits. This was found after a clang static code analyzer
   analysis (great tool, and special thanks to Marcin for telling me about
   it!)
+- bugfix: batches which had actions in error were not properly retried in
+  all cases
 ---------------------------------------------------------------------------
 Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-30
 - bugfix: compile failed on systems without epoll_create1()
diff --git a/action.c b/action.c
index 48ed8880..4bf8ba04 100644
--- a/action.c
+++ b/action.c
@@ -655,30 +655,34 @@ rsRetVal actionDbgPrint(action_t *pThis)
 /* prepare the calling parameters for doAction()
  * rgerhards, 2009-05-07
  */
-static rsRetVal prepareDoActionParams(action_t *pAction, msg_t *pMsg, uchar **ppMsgs, size_t *lenMsgs)
+static rsRetVal prepareDoActionParams(action_t *pAction, batch_obj_t *pElem)
 {
 	int i;
+	msg_t *pMsg;
 	DEFiRet;
 
 	ASSERT(pAction != NULL);
+	ASSERT(pElem != NULL);
 
+	pMsg = (msg_t*) pElem->pUsrp;
 	/* here we must loop to process all requested strings */
 	for(i = 0 ; i < pAction->iNumTpls ; ++i) {
 		switch(pAction->eParamPassing) {
 			case ACT_STRING_PASSING:
-				CHKiRet(tplToString(pAction->ppTpl[i], pMsg, &(ppMsgs[i]), &lenMsgs[i]));
+				CHKiRet(tplToString(pAction->ppTpl[i], pMsg, &(pElem->staticActStrings[i]),
+					&pElem->staticLenStrings[i]));
+				pElem->staticActParams[i] = pElem->staticActStrings[i];
 				break;
 			case ACT_ARRAY_PASSING:
-				CHKiRet(tplToArray(pAction->ppTpl[i], pMsg, (uchar***) &(ppMsgs[i])));
+				CHKiRet(tplToArray(pAction->ppTpl[i], pMsg, (uchar***) &(pElem->staticActParams[i])));
 				break;
 			case ACT_MSG_PASSING:
-				/* we abuse the uchar* ptr, it now actually is a void*, but we can not
-				 * change that other than by chaning the interface, what we don't like...
-				 */
-				ppMsgs[i] = (void*) pMsg;
-				lenMsgs[i] = 0; /* init for *next* action */
+				pElem->staticActParams[i] = (void*) pMsg;
+				break;
+			default:dbgprintf("software bug/error: unknown pAction->eParamPassing %d in prepareDoActionParams\n",
+					   (int) pAction->eParamPassing);
+				assert(0); /* software bug if this happens! */
 				break;
-			default:assert(0); /* software bug if this happens! */
 		}
 	}
 
@@ -687,26 +691,56 @@ finalize_it:
 }
 
 
-/* cleanup doAction calling parameters
- * rgerhards, 2009-05-07
+/* free a batches ressources, but not string buffers (because they will
+ * most probably be reused). String buffers are only deleted upon final
+ * destruction of the batch.
+ * This function here must be called only when the batch is actually no
+ * longer used, also not for retrying actions or such. It invalidates
+ * buffers.
+ * rgerhards, 2010-12-17
  */
-static rsRetVal cleanupDoActionParams(action_t *pAction, uchar ***ppMsgs)
+static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch)
 {
 	int iArr;
-	int i;
+	int i, j;
+	batch_obj_t *pElem;
+	uchar ***ppMsgs;
 	DEFiRet;
 
 	ASSERT(pAction != NULL);
 
-	for(i = 0 ; i < pAction->iNumTpls ; ++i) {
-		if(((uchar**)ppMsgs)[i] != NULL) {
-			iArr = 0;
-			while((((uchar***)ppMsgs)[i][iArr]) != NULL) {
-				d_free(((uchar ***)ppMsgs)[i][iArr++]);
-				((uchar ***)ppMsgs)[i][iArr++] = NULL;
+	for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) {
+		pElem = &(pBatch->pElem[i]);
+		if(pElem->bFilterOK && pElem->state != BATCH_STATE_DISC) {
+			switch(pAction->eParamPassing) {
+			case ACT_ARRAY_PASSING:
+				ppMsgs = (uchar***) pElem->staticActParams;
+				for(i = 0 ; i < pAction->iNumTpls ; ++i) {
+					if(((uchar**)ppMsgs)[i] != NULL) {
+						iArr = 0;
+						while(ppMsgs[i][iArr] != NULL) {
+							d_free(ppMsgs[i][iArr++]);
+							ppMsgs[i][iArr++] = NULL;
+						}
+						d_free(((uchar**)ppMsgs)[i]);
+						((uchar**)ppMsgs)[i] = NULL;
+					}
+				}
+				break;
+			case ACT_STRING_PASSING:
+			case ACT_MSG_PASSING:
+				/* nothing to do in that case */
+				/* TODO ... and yet we do something ;) This is considered not
+				 * really needed, but I was not bold enough to remove that while
+				 * fixing the stable. It should be removed in a devel version
+				 * soon (I really don't see a reason why we would need it).
+				 * rgerhards, 2010-12-16
+				 */
+				for(j = 0 ; j < pAction->iNumTpls ; ++j) {
+					((uchar**)pElem->staticActParams)[j] = NULL;
+				}
+				break;
 			}
-			d_free(((uchar**)ppMsgs)[i]);
-			((uchar**)ppMsgs)[i] = NULL;
 		}
 	}
 
@@ -720,7 +754,6 @@ static rsRetVal cleanupDoActionParams(action_t *pAction, uchar ***ppMsgs)
 rsRetVal
 actionCallDoAction(action_t *pThis, msg_t *pMsg, void *actParams)
 {
-	int i;
 	DEFiRet;
 
 	ASSERT(pThis != NULL);
@@ -729,10 +762,7 @@ actionCallDoAction(action_t *pThis, msg_t *pMsg, void *actParams)
 	DBGPRINTF("entering actionCalldoAction(), state: %s\n", getActStateName(pThis));
 
 	pThis->bHadAutoCommit = 0;
-//d_pthread_mutex_lock(&pThis->mutActExec);
-//pthread_cleanup_push(mutexCancelCleanup, &pThis->mutActExec);
 	iRet = pThis->pMod->mod.om.doAction(actParams, pMsg->msgFlags, pThis->pModData);
-//pthread_cleanup_pop(1); /* unlock mutex */
 	switch(iRet) {
 		case RS_RET_OK:
 			actionCommitted(pThis);
@@ -761,27 +791,6 @@ actionCallDoAction(action_t *pThis, msg_t *pMsg, void *actParams)
 	iRet = getReturnCode(pThis);
 
 finalize_it:
-
-	/* we need to cleanup the batches string buffers if they have been used
-	 * in a non-standard way. -- rgerhards, 2010-06-15
-	 * Note that we may do this at the batch level, this would provide a bit
-	 * more concurrency (TODO).
-	 */
-	switch(pThis->eParamPassing) {
-	case ACT_STRING_PASSING:
-		/* nothing to do in that case */
-		break;
-	case ACT_ARRAY_PASSING:
-		cleanupDoActionParams(pThis, actParams); /* iRet ignored! */
-		break;
-	case ACT_MSG_PASSING:
-		/* nothing to do in that case */
-		for(i = 0 ; i < pThis->iNumTpls ; ++i) {
-			((uchar**)actParams)[i] = NULL;
-		}
-		break;
-	}
-
 	RETiRet;
 }
 
@@ -944,10 +953,12 @@ submitBatch(action_t *pAction, batch_t *pBatch, int nElem)
 	int i;
 	int bDone;
 	rsRetVal localRet;
+	int wasDoneTo;
 	DEFiRet;
 
 	assert(pBatch != NULL);
 
+	wasDoneTo = pBatch->iDoneUpTo;
 	bDone = 0;
 	do {
 		localRet = tryDoAction(pAction, pBatch, &nElem);
@@ -971,7 +982,7 @@ submitBatch(action_t *pAction, batch_t *pBatch, int nElem)
 			; /* do nothing, this will retry the full batch */
 		} else if(localRet == RS_RET_ACTION_FAILED) {
 			/* in this case, everything not yet committed is BAD */
-			for(i = pBatch->iDoneUpTo ; i < pBatch->iDoneUpTo + nElem ; ++i) {
+			for(i = pBatch->iDoneUpTo ; i < wasDoneTo + nElem ; ++i) {
 				if(   pBatch->pElem[i].state != BATCH_STATE_DISC
 				   && pBatch->pElem[i].state != BATCH_STATE_COMM ) {
 					pBatch->pElem[i].state = BATCH_STATE_BAD;
@@ -1021,8 +1032,7 @@ prepareBatch(action_t *pAction, batch_t *pBatch)
 		pElem = &(pBatch->pElem[i]);
 		if(pElem->bFilterOK && pElem->state != BATCH_STATE_DISC) {
 			pElem->state = BATCH_STATE_RDY;
-			prepareDoActionParams(pAction, (msg_t*) pElem->pUsrp,
-				 	      (uchar**) &(pElem->staticActParams), pElem->staticLenParams);
+			prepareDoActionParams(pAction, pElem);
 		}
 	}
 	RETiRet;
@@ -1055,6 +1065,7 @@ static rsRetVal
 processBatchMain(action_t *pAction, batch_t *pBatch, int *pbShutdownImmediate)
 {
 	int *pbShutdownImmdtSave;
+	rsRetVal localRet;
 	DEFiRet;
 
 	assert(pBatch != NULL);
@@ -1076,6 +1087,16 @@ processBatchMain(action_t *pAction, batch_t *pBatch, int *pbShutdownImmediate)
 
 	pthread_cleanup_pop(1); /* unlock mutex */
 
+	/* even if processAction failed, we need to release the batch (else we
+	 * have a memory leak). So we do this first, and then check if we need to
+	 * return an error code. If so, the code from processAction has priority.
+	 * rgerhards, 2010-12-17
+	 */
+	localRet = releaseBatch(pAction, pBatch);
+
+	if(iRet == RS_RET_OK)
+		iRet = localRet;
+
 finalize_it:
 	pBatch->pbShutdownImmediate = pbShutdownImmdtSave;
 	RETiRet;
diff --git a/runtime/batch.h b/runtime/batch.h
index 68f48d8b..d0504f2b 100644
--- a/runtime/batch.h
+++ b/runtime/batch.h
@@ -53,9 +53,11 @@ struct batch_obj_s {
 	 */
 	sbool bFilterOK;	/* work area for filter processing (per action, reused!) */
 	sbool bPrevWasSuspended;
-	void *staticActParams[CONF_OMOD_NUMSTRINGS_MAXSIZE];
+	/* following are caches to save allocs if not absolutely necessary */
+	uchar *staticActStrings[CONF_OMOD_NUMSTRINGS_MAXSIZE]; /**< for strings */
 				/* a cache to save malloc(), if not absolutely necessary */
-	size_t staticLenParams[CONF_OMOD_NUMSTRINGS_MAXSIZE];
+	void *staticActParams[CONF_OMOD_NUMSTRINGS_MAXSIZE]; /**< for anything else */
+	size_t staticLenStrings[CONF_OMOD_NUMSTRINGS_MAXSIZE];
 				/* and the same for the message length (if used) */
 	/* end action work variables */
 };
@@ -152,7 +154,10 @@ batchFree(batch_t *pBatch) {
 	int j;
 	for(i = 0 ; i < pBatch->maxElem ; ++i) {
 		for(j = 0 ; j < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++j) {
-			free(pBatch->pElem[i].staticActParams[j]);
+			/* staticActParams MUST be freed immediately (if required),
+			 * so we do not need to do that!
+			 */
+			free(pBatch->pElem[i].staticActStrings[j]);
 		}
 	}
 	free(pBatch->pElem);
-- 
cgit v1.2.3