diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
commit | 4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21 (patch) | |
tree | 70b8123a9d7d648fe007e8f6c01466e9b26fd4e1 /runtime/conf.c | |
parent | c4c20c18aae7c95c1e69c10d2ea9efbc3c2c1913 (diff) | |
parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
download | rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.gz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.xz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/parser.c
Diffstat (limited to 'runtime/conf.c')
-rw-r--r-- | runtime/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index e2d3a889..bbd2147a 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); |