1 files changed, 4 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index a96f9b8d9d..6291e19a09 100644
--- a/eval.c
+++ b/eval.c
@@ -1390,16 +1390,20 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state)
 {
     VALUE result = Qnil;	/* OK */
     int status;
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
 
     PUSH_THREAD_TAG();
     if ((status = EXEC_TAG()) == 0) {
 	result = (*proc) (data);
     }
     POP_THREAD_TAG();
+
     if (state) {
 	*state = status;
     }
     if (status != 0) {
+	th->cfp = cfp;
 	return Qnil;
     }