summaryrefslogtreecommitdiffstats
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
commit2771c92103a87f288541e4610e0c3c2325dfe7e4 (patch)
tree49bf1d6e126d160502ae9141b2f99c6d2e99490f
parent13691736b655c78e6c4101597c6f71f41cb06c75 (diff)
downloadruby-2771c92103a87f288541e4610e0c3c2325dfe7e4.tar.gz
ruby-2771c92103a87f288541e4610e0c3c2325dfe7e4.tar.xz
ruby-2771c92103a87f288541e4610e0c3c2325dfe7e4.zip
* eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587]
git-svn-id: http://svn.ruby-lang.org/repos/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 d4e1760a8..29878e1f6 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 1dba36691..a62c318eb 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