1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2001-11-15 15:56:08 +00:00
parent a79f85e6cf
commit 35008e2087
2 changed files with 8 additions and 2 deletions

View file

@ -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

View file

@ -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++) {