diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 10:13:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 10:13:35 +0200 |
| commit | eb95af01e8feb4b3b10e600697b8b8f07a693840 (patch) | |
| tree | 7de27e1442f40c25ff1be5c245e8361a81c6b6ea /grammar | |
| parent | e443802244207fe746476cbf87e64364b7d408b1 (diff) | |
| parent | a781f8b8b0eee6379880822933b9966ffed5492f (diff) | |
| download | rsyslog-eb95af01e8feb4b3b10e600697b8b8f07a693840.tar.gz rsyslog-eb95af01e8feb4b3b10e600697b8b8f07a693840.tar.bz2 rsyslog-eb95af01e8feb4b3b10e600697b8b8f07a693840.zip | |
Merge branch 'v7-stable'
Conflicts:
runtime/conf.c
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/rainerscript.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 3eac68d8..ff8eba0c 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -234,6 +234,7 @@ DecodePropFilter(uchar *pline, struct cnfstmt *stmt) } else { parser_errmsg("error: invalid compare operation '%s'", (char*) rsCStrGetSzStrNoNULL(pCSCompOp)); + return(RS_RET_ERR); } rsCStrDestruct(&pCSCompOp); /* no longer needed */ @@ -2689,14 +2690,15 @@ struct cnfstmt * cnfstmtNewPROPFILT(char *propfilt, struct cnfstmt *t_then) { struct cnfstmt* cnfstmt; - rsRetVal lRet; if((cnfstmt = cnfstmtNew(S_PROPFILT)) != NULL) { cnfstmt->printable = (uchar*)propfilt; cnfstmt->d.s_propfilt.t_then = t_then; cnfstmt->d.s_propfilt.propName = NULL; cnfstmt->d.s_propfilt.regex_cache = NULL; cnfstmt->d.s_propfilt.pCSCompValue = NULL; - lRet = DecodePropFilter((uchar*)propfilt, cnfstmt); + if(DecodePropFilter((uchar*)propfilt, cnfstmt) != RS_RET_OK) { + cnfstmt->nodetype = S_NOP; /* disable action! */ + } } return cnfstmt; } |