* eval.c (get_backtrace): check the result more.

shyouhei · shyouhei · commit 1a68238e695a · 2007-08-22T01:57:22.000Z
[ruby-dev:31261] [ruby-bugs-12398] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 10:55:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (get_backtrace): check the result more.
+	  [ruby-dev:31261] [ruby-bugs-12398]
+
 Wed Aug 22 10:36:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_lshift, rb_big_rshift): separated functions
diff --git a/error.c b/error.c
@@ -488,14 +488,14 @@ static VALUE
 exc_backtrace(exc)
     VALUE exc;
 {
-    ID bt = rb_intern("bt");
+    static ID bt;
 
-    if (!rb_ivar_defined(exc, bt)) return Qnil;
-    return rb_ivar_get(exc, bt);
+    if (!bt) bt = rb_intern("bt");
+    return rb_attr_get(exc, bt);
 }
 
-static VALUE
-check_backtrace(bt)
+VALUE
+rb_check_backtrace(bt)
     VALUE bt;
 {
     long i;
@@ -532,7 +532,7 @@ exc_set_backtrace(exc, bt)
     VALUE exc;
     VALUE bt;
 {
-    return rb_iv_set(exc, "bt", check_backtrace(bt));
+    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
 }
 
 /*
diff --git a/eval.c b/eval.c
@@ -1197,14 +1197,16 @@ error_pos()
     }
 }
 
+VALUE rb_check_backtrace(VALUE);
+
 static VALUE
 get_backtrace(info)
     VALUE info;
 {
     if (NIL_P(info)) return Qnil;
     info = rb_funcall(info, rb_intern("backtrace"), 0);
     if (NIL_P(info)) return Qnil;
-    return rb_check_array_type(info);
+    return rb_check_backtrace(info);
 }
 
 static void
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 71
+#define RUBY_PATCHLEVEL 72
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -488,14 +488,14 @@ static VALUE`
`488`	`488`	`exc_backtrace(exc)`
`489`	`489`	`VALUE exc;`
`490`	`490`	`{`
`491`		`- ID bt = rb_intern("bt");`
	`491`	`+ static ID bt;`
`492`	`492`
`493`		`- if (!rb_ivar_defined(exc, bt)) return Qnil;`
`494`		`- return rb_ivar_get(exc, bt);`
	`493`	`+ if (!bt) bt = rb_intern("bt");`
	`494`	`+ return rb_attr_get(exc, bt);`
`495`	`495`	`}`
`496`	`496`
`497`		`-static VALUE`
`498`		`-check_backtrace(bt)`
	`497`	`+VALUE`
	`498`	`+rb_check_backtrace(bt)`
`499`	`499`	`VALUE bt;`
`500`	`500`	`{`
`501`	`501`	`long i;`
`@@ -532,7 +532,7 @@ exc_set_backtrace(exc, bt)`
`532`	`532`	`VALUE exc;`
`533`	`533`	`VALUE bt;`
`534`	`534`	`{`
`535`		`- return rb_iv_set(exc, "bt", check_backtrace(bt));`
	`535`	`+ return rb_iv_set(exc, "bt", rb_check_backtrace(bt));`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1197,14 +1197,16 @@ error_pos()`
`1197`	`1197`	`}`
`1198`	`1198`	`}`
`1199`	`1199`
	`1200`	`+VALUE rb_check_backtrace(VALUE);`
	`1201`	`+`
`1200`	`1202`	`static VALUE`
`1201`	`1203`	`get_backtrace(info)`
`1202`	`1204`	`VALUE info;`
`1203`	`1205`	`{`
`1204`	`1206`	`if (NIL_P(info)) return Qnil;`
`1205`	`1207`	`info = rb_funcall(info, rb_intern("backtrace"), 0);`
`1206`	`1208`	`if (NIL_P(info)) return Qnil;`
`1207`		`- return rb_check_array_type(info);`
	`1209`	`+ return rb_check_backtrace(info);`
`1208`	`1210`	`}`
`1209`	`1211`
`1210`	`1212`	`static void`