summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-29 08:21:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-29 08:21:11 +0000
commit3a61df35da6f9a4f3b6f7c65b0a7a0f31bf26abc (patch)
tree9bdfddc17430103c152008874b5612c3aebd910e
parent1840408f2988849f30456663745b03015f711a5e (diff)
downloadruby-3a61df35da6f9a4f3b6f7c65b0a7a0f31bf26abc.tar.gz
ruby-3a61df35da6f9a4f3b6f7c65b0a7a0f31bf26abc.tar.xz
ruby-3a61df35da6f9a4f3b6f7c65b0a7a0f31bf26abc.zip
* eval.c (rb_longjmp): must not disturb original jump.
[ruby-dev:21733] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1aad2ef49..17284bdea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 29 17:16:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_longjmp): must not disturb original jump.
+ [ruby-dev:21733]
+
Wed Oct 29 15:28:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (Init_Proc): taint preallocated exception object
diff --git a/eval.c b/eval.c
index cac306671..1078b85fc 100644
--- a/eval.c
+++ b/eval.c
@@ -3950,7 +3950,7 @@ rb_longjmp(tag, mesg)
}
POP_TAG();
if (status == TAG_FATAL && ruby_errinfo == exception_error) {
- ruby_errinfo = Qnil;
+ ruby_errinfo = mesg;
}
else if (status) {
thread_reset_raised();