summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-04 23:55:33 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-04 23:55:33 +0000
commitd754218777149f842d406495d331854026068e62 (patch)
treeffdd6610789b563aafc1221ed95b3f8a61aa10ed /array.c
parentfead30adbbfd79090804aad5f74d8a54b7d4ba2c (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_7@22058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/array.c b/array.c
index 7e8c12b683..89f74d01ff 100644
--- a/array.c
+++ b/array.c
@@ -1405,7 +1405,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 {