diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-10 11:44:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-10 11:44:43 +0200 |
| commit | 4a85395476b02cd0db791c6b208af684a9a22ac1 (patch) | |
| tree | 45591fd813c727d8299f271317e5b0433396cbba | |
| parent | a69cb35a80ecf772d62ab73eecae55e42eb53280 (diff) | |
| parent | 248474b74f4e33c09fda855a74a02c7029f6e2f9 (diff) | |
| download | rsyslog-4a85395476b02cd0db791c6b208af684a9a22ac1.tar.gz rsyslog-4a85395476b02cd0db791c6b208af684a9a22ac1.tar.bz2 rsyslog-4a85395476b02cd0db791c6b208af684a9a22ac1.zip | |
Merge branch 'v7-4-4-ak' into v7-stable
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- bugfix: array-based ==/!= comparisions lead to invalid results + This was a regression introduced in 7.3.5 bei the PRI optimizer --------------------------------------------------------------------------- Version 7.4.5 [v7.4-stable] 2013-09-?? - mmanon: removed the check for specific "terminator characters" after diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 2b8d600d..f4833679 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2779,7 +2779,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) parser_errmsg("invalid facility '%s', expression will always " "evaluate to FALSE", cstr); } else { - /* we can acutally optimize! */ + /* we can actually optimize! */ DBGPRINTF("optimizer: change comparison OP to FUNC prifilt()\n"); func = cnffuncNew_prifilt(fac); if(expr->nodetype == CMP_NE) @@ -2858,7 +2858,7 @@ cnfexprOptimize_AND_OR(struct cnfexpr *expr) static inline void cnfexprOptimize_CMPEQ_arr(struct cnfarray *arr) { - DBGPRINTF("optimizer: sorting array for CMP_EQ/NEQ comparison\n"); + DBGPRINTF("optimizer: sorting array of %d members for CMP_EQ/NEQ comparison\n", arr->nmemb); qsort(arr->arr, arr->nmemb, sizeof(es_str_t*), qs_arrcmp); } @@ -2922,7 +2922,8 @@ cnfexprOptimize(struct cnfexpr *expr) } if(expr->l->nodetype == 'V') { expr = cnfexprOptimize_CMP_var(expr); - } else if(expr->r->nodetype == 'A') { + } + if(expr->r->nodetype == 'A') { cnfexprOptimize_CMPEQ_arr((struct cnfarray *)expr->r); } break; |