diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-15 15:56:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-15 15:56:08 +0000 |
commit | 35008e2087fd1ef07ad749a75db5417721ef8c69 (patch) | |
tree | 0203917a0867aeb9d08babd0a7f3333d6a054428 | |
parent | a79f85e6cf3911d0f5df62a954eaa963d6bb6558 (diff) | |
download | ruby-35008e2087fd1ef07ad749a75db5417721ef8c69.tar.gz |
* array.c (rb_ary_join): non-nil separator must be converted to
String. and separators' total length was wrong.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Nov 15 15:29:39 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * array.c (rb_ary_join): non-nil separator must be converted to + String. and separators' total length was wrong. + Thu Nov 15 03:37:17 2001 Usaku Nakamura <usa@ruby-lang.org> * hash.c (ruby_setenv): remove USE_WIN32_RTL_ENV block since it's @@ -804,8 +804,9 @@ rb_ary_join(ary, sep) len += 10; } } - if (!NIL_P(sep) && TYPE(sep) == T_STRING) { - len += RSTRING(sep)->len * RARRAY(ary)->len - 1; + if (!NIL_P(sep)) { + StringValue(sep); + len += RSTRING(sep)->len * (RARRAY(ary)->len - 1); } result = rb_str_buf_new(len); for (i=0; i<RARRAY(ary)->len; i++) { |