summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-16 12:16:54 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-16 12:16:54 +0100
commitec6230cffe6e06957113d53272d00dc859a3e617 (patch)
tree0727d3a3e39c99317c5d5bb562ea027e52f1017f
parent925504d565c6cf4a712dd8c8217891662aaf639e (diff)
downloadrsyslog-ec6230cffe6e06957113d53272d00dc859a3e617.tar.gz
rsyslog-ec6230cffe6e06957113d53272d00dc859a3e617.tar.xz
rsyslog-ec6230cffe6e06957113d53272d00dc859a3e617.zip
improved some code based on clang static analyzer results
-rw-r--r--ChangeLog3
-rw-r--r--runtime/conf.c2
-rw-r--r--runtime/ctok.c4
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);