From 1c5640855fe8527e22572319fcdcc5aa0d89cc2d Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Jan 2008 18:41:44 +0000 Subject: * eval.c (eval): check if backtrace is empty. [ruby-core:15040] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d8c248fce..2ce108cd57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jan 15 03:41:42 2008 Nobuyoshi Nakada + + * eval.c (eval): check if backtrace is empty. [ruby-core:15040] + Tue Jan 15 01:28:47 2008 Nobuyoshi Nakada * common.mk: simplified dummy objects dependencies. diff --git a/eval.c b/eval.c index c36fd9bb22..060de462f2 100644 --- a/eval.c +++ b/eval.c @@ -1757,16 +1757,17 @@ eval(VALUE self, VALUE src, VALUE scope, const char *file, int line) if (state == TAG_RAISE) { VALUE errinfo = th->errinfo; if (strcmp(file, "(eval)") == 0) { - VALUE mesg, errat; + VALUE mesg, errat, bt2; errat = get_backtrace(errinfo); mesg = rb_attr_get(errinfo, rb_intern("mesg")); - if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) { - if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) { + if (!NIL_P(errat) && TYPE(errat) == T_ARRAY && + (bt2 = backtrace(-2), RARRAY_LEN(bt2) > 0)) { + if (!NIL_P(mesg) && TYPE(mesg) == T_STRING && !RSTRING_LEN(mesg)) { rb_str_update(mesg, 0, 0, rb_str_new2(": ")); rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]); } - RARRAY_PTR(errat)[0] = RARRAY_PTR(backtrace(-2))[0]; + RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0]; } } rb_exc_raise(errinfo); -- cgit v1.2.3