Merge branch 'beta'

Conflicts:
	ChangeLog

2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 80490e82..91400888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,14 @@ Version 6.5.0  [devel] 2012-0?-??
 - added new 0mq plugins (via czmq lib)
   Thanks to David Kelly for contributing these modules
 ---------------------------------------------------------------------------
+Version 6.3.11  [BETA] 2012-06-??
+- bugfix: expression-based filters with AND/OR could segfault
+  due to a problem with boolean shortcut operations. From the user's
+  perspective, the segfault is almost non-deterministic (it occurs when
+  a shortcut is used).
+  Thanks to Lars Peterson for providing the initial bug report and his
+  support in solving it.
+---------------------------------------------------------------------------
 Version 6.3.10  [BETA] 2012-06-04
 - bugfix: delayble source could block action queue, even if there was
   a disk queue associated with it. The root cause of this problem was
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 66932c77..a5cc10c2 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -1129,8 +1129,9 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr)
 				ret->d.n = 1ll;
 			else 
 				ret->d.n = 0ll;
+			if(r.datatype == 'S') es_deleteStr(r.d.estr); 
 		}
-		FREE_BOTH_RET;
+		if(l.datatype == 'S') es_deleteStr(l.d.estr);
 		break;
 	case AND:
 		cnfexprEval(expr->l, &l, usrptr);
@@ -1141,10 +1142,11 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr)
 				ret->d.n = 1ll;
 			else 
 				ret->d.n = 0ll;
+			if(r.datatype == 'S') es_deleteStr(r.d.estr); 
 		} else {
 			ret->d.n = 0ll;
 		}
-		FREE_BOTH_RET;
+		if(l.datatype == 'S') es_deleteStr(l.d.estr);
 		break;
 	case NOT:
 		cnfexprEval(expr->r, &r, usrptr);