diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-20 14:10:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-20 14:10:50 +0100 |
| commit | b83e124aa772347a5b2f7d010dcc6f12b056a0a0 (patch) | |
| tree | a0a1a84527b6af9595136a7ae8bf72b9985b49a9 /grammar/rainerscript.c | |
| parent | 1a040708160cb23a899e320a456957f5392a144f (diff) | |
| parent | cac0a1efdc9ce79b4503431d07075b932a6dcdb2 (diff) | |
| download | rsyslog-b83e124aa772347a5b2f7d010dcc6f12b056a0a0.tar.gz rsyslog-b83e124aa772347a5b2f7d010dcc6f12b056a0a0.tar.bz2 rsyslog-b83e124aa772347a5b2f7d010dcc6f12b056a0a0.zip | |
Merge branch 'v7-stable' into v7-stable-libnet-frag
Conflicts:
plugins/omudpspoof/omudpspoof.c
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 6b21bc9a..c5f2148e 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -1250,6 +1250,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 \ |