summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-24 23:04:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-24 23:04:04 +0000
commitda1265564a0406050ee14dc25f0f4377ea930ae1 (patch)
tree49bf1d6e126d160502ae9141b2f99c6d2e99490f
parent9f196e03cb90483dda162d8bf0ed6f3b3b6f8b2d (diff)
* eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d4e1760a87..29878e1f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 25 08:03:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587]
+
Sun Oct 24 00:40:50 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
diff --git a/eval.c b/eval.c
index 1dba366916..a62c318ebc 100644
--- a/eval.c
+++ b/eval.c
@@ -1080,7 +1080,7 @@ get_backtrace(info)
VALUE info;
{
if (NIL_P(info)) return Qnil;
- return rb_funcall(info, rb_intern("backtrace"), 0);
+ return rb_check_array_type(rb_funcall(info, rb_intern("backtrace"), 0));
}
static void