merge 8.6; update changes

3 files changed, 13 insertions, 1 deletions

diff --git a/changes b/changes
index 48e4624..040f360 100644
--- a/changes
+++ b/changes
@@ -8827,4 +8827,6 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 
 2017-12-08 (new)[TIP 477] nmake build system reform (nadkarni)
 
+2017-12-19 (bug)[586e71] EvalObjv exception handling at level #0 (sebres,porter)
+
 --- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/tcl/ for details
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 79de61e..ddc828a 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4561,7 +4561,7 @@ TEOV_Exception(
 	if (result == TCL_RETURN) {
 	    result = TclUpdateReturnInfo(iPtr);
 	}
-	if ((result != TCL_ERROR) && !allowExceptions) {
+	if ((result != TCL_OK) && (result != TCL_ERROR) && !allowExceptions) {
 	    ProcessUnexpectedResult(interp, result);
 	    result = TCL_ERROR;
 	}
diff --git a/tests/basic.test b/tests/basic.test
index 7ff0669..865814a 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -984,6 +984,16 @@ test basic-49.2 {Tcl_EvalEx: verify TCL_EVAL_GLOBAL operation} testevalex {
     set ::context
 } {global}
 
+test basic-50.1 {[586e71dce4] EvalObjv level #0 exception handling} -setup {
+    interp create slave
+    interp alias {} foo slave return
+} -body {
+    list [catch foo m] $m
+} -cleanup {
+    unset -nocomplain m
+    interp delete slave
+} -result {0 {}}
+
 # Clean up after expand tests
 unset noComp l1 l2 constraints
 rename l3 {}