merge revision(s) 20103:

shyouhei · shyouhei · commit a120cd596658 · 2009-02-04T23:55:01.000Z
* array.c (rb_ary_join): do not repeat self in a recursive array.
	  [ruby-dev:37019]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  5 08:54:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_join): do not repeat self in a recursive array.
+	  [ruby-dev:37019]
+
 Wed Feb  4 14:25:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_globs): need taint check.  reported by steve
diff --git a/array.c b/array.c
@@ -1286,7 +1286,7 @@ rb_ary_join(ary, sep)
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
 		tmp = rb_str_new2("[...]");
 	    }
 	    else {
diff --git a/version.h b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-04"
+#define RUBY_RELEASE_DATE "2009-02-05"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090204
-#define RUBY_PATCHLEVEL 319
+#define RUBY_RELEASE_CODE 20090205
+#define RUBY_PATCHLEVEL 320
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

Original file line number	Diff line number	Diff line change
`@@ -1286,7 +1286,7 @@ rb_ary_join(ary, sep)`
`1286`	`1286`	`case T_STRING:`
`1287`	`1287`	`break;`
`1288`	`1288`	`case T_ARRAY:`
`1289`		`- if (rb_inspecting_p(tmp)) {`
	`1289`	`+ if (tmp == ary \|\| rb_inspecting_p(tmp)) {`
`1290`	`1290`	`tmp = rb_str_new2("[...]");`
`1291`	`1291`	`}`
`1292`	`1292`	`else {`