diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:33:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:33:57 +0100 |
| commit | a05ede918675933264ef0d9398e509798d7e8122 (patch) | |
| tree | 7627b5d86e0c30941d6a4ad4b087ecbf52ad6305 /grammar/rainerscript.c | |
| parent | 5f3d6db7965ae7ac247ed0be9c37f0e8df2dfc84 (diff) | |
| parent | db01eab26b163362652afa7931762de1aafb4c32 (diff) | |
| download | rsyslog-a05ede918675933264ef0d9398e509798d7e8122.tar.gz rsyslog-a05ede918675933264ef0d9398e509798d7e8122.tar.bz2 rsyslog-a05ede918675933264ef0d9398e509798d7e8122.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'grammar/rainerscript.c')
| -rw-r--r-- | grammar/rainerscript.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index bacf851b..8eddf82f 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -1401,6 +1401,10 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop) } else if(expr->r->nodetype != 'A') { \ cnfexprEval(expr->r, &r, usrptr); \ estr_r = var2String(&r, &bMustFree); \ + } else { \ + /* Note: this is not really necessary, but if we do not */ \ + /* do it, we get a very irritating compiler warning... */ \ + estr_r = NULL; \ } #define FREE_TWO_STRINGS \ |