From 0cd1b170ff91ee5002c9c9ea0b291f9189557bd1 Mon Sep 17 00:00:00 2001 From: Pavel Levshin Date: Tue, 29 Oct 2013 09:34:17 +0100 Subject: bugfix: abort if "if $syslogfacility-text..." was being used --- grammar/rainerscript.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 986d2802..b03e7c12 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2926,12 +2926,15 @@ cnfexprOptimize(struct cnfexpr *expr) expr->r = exprswap; } } - if(expr->l->nodetype == 'V') { - expr = cnfexprOptimize_CMP_var(expr); - } if(expr->r->nodetype == 'A') { cnfexprOptimize_CMPEQ_arr((struct cnfarray *)expr->r); } + /* This should be evaluated last because it may change expr + * to a function. + */ + if(expr->l->nodetype == 'V') { + expr = cnfexprOptimize_CMP_var(expr); + } break; case CMP_LE: case CMP_GE: -- cgit v1.2.3 From f11d853d89716a9bf29afd16841a149516ca2ef3 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 29 Oct 2013 09:37:34 +0100 Subject: doc: update ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index b40e3c71..97bebc74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,10 @@ Version 7.4.6 [v7.4-stable] 2013-11-?? Thanks to Pavel Levshin for reporting the problem and its location. - bugfix: memleak in re_extract() function Thanks to Pavel Levshin for reporting this problem. +- bugfix: potential abort in RainerScript optimizer + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=488 + Thanks to Thomas Doll for reporting the problem and Pavel Levshin for + fixing it. - bugfix: memory leak in omhiredis Thanks to Pavel Levshin for the fix - bugfix: segfault if variable was assigned to non-container subtree -- cgit v1.2.3 From 73e7088748e560cd0c6d1ed7264951d32f64d060 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 29 Oct 2013 16:21:29 +0100 Subject: prepare for 7.4.6 release --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97bebc74..fd4e3942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 7.4.6 [v7.4-stable] 2013-11-?? +Version 7.4.6 [v7.4-stable] 2013-10-31 - bugfix: potential abort during HUP This could happen when one of imklog, imzmq3, imkmsg, impstats, imjournal, or imuxsock were under heavy load during a HUP. diff --git a/configure.ac b/configure.ac index e253c916..ee3394b5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[7.4.5],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.4.6],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index 801804e6..a8477bcd 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ professional services available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 7.4.5 (v7.4-stable branch) of rsyslog. +

This documentation is for version 7.4.6 (v7.4-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit v1.2.3 From 0732e088e985482c7f897c8fd571587fa808f6d0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 31 Oct 2013 11:06:46 +0100 Subject: doc: update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 50931420..2b40634a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ Version 7.5.6 [devel] 2013-10-29 - bugfix: invalid property filter was not properly disabled in ruleset Note: the cosmetic memory leak introduced with that patch in 7.4.5 is now also fixed. +- imported bugfixes from 7.4.6 stable release --------------------------------------------------------------------------- Version 7.5.5 [devel] 2013-10-16 - imfile: permit to monitor an unlimited number of files -- cgit v1.2.3