summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-04 23:55:01 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-04 23:55:01 +0000
commita120cd596658f4bd85b332149bd204299e2ab0e7 (patch)
treef6870fa85dc1da4ac0f34debafae0ae16ed8a0f1
parent1e6e5658cd4a45870e1ecfee404d9420564b4d67 (diff)
merge revision(s) 20103:
* 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
-rw-r--r--ChangeLog5
-rw-r--r--array.c2
-rw-r--r--version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 769643ec2a..82ef7eac8b 100644
--- 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
index 503a7adba3..6441d871ed 100644
--- 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
index 842de9b213..39a4a87af0 100644
--- 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[];