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

* file.c (rb_file_join): convert components by to_s instead of to_str.

Browse source 
fixed: [ruby-dev:27127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-09-17 16:10:53 +00:00
parent 273c4d116b
commit 22cfbc2371
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
file.c
View file

@ -2703,13 +2703,10 @@ static VALUE
rb_file_join(VALUE ary, VALUE sep) rb_file_join(VALUE ary, VALUE sep)
{ {
long len, i; long len, i;
int taint = 0;
VALUE result, tmp; VALUE result, tmp;
char *name, *tail; char *name, *tail;
if (RARRAY(ary)->len == 0) return rb_str_new(0, 0); if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
if (OBJ_TAINTED(ary)) taint = 1;
if (OBJ_TAINTED(sep)) taint = 1;
len = 1; len = 1;
for (i=0; i<RARRAY(ary)->len; i++) { for (i=0; i<RARRAY(ary)->len; i++) {
@ -2724,6 +2721,7 @@ rb_file_join(VALUE ary, VALUE sep)
len += RSTRING(sep)->len * RARRAY(ary)->len - 1; len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
} }
result = rb_str_buf_new(len); result = rb_str_buf_new(len);
OBJ_INFECT(result, ary);
for (i=0; i<RARRAY(ary)->len; i++) { for (i=0; i<RARRAY(ary)->len; i++) {
tmp = RARRAY(ary)->ptr[i]; tmp = RARRAY(ary)->ptr[i];
switch (TYPE(tmp)) { switch (TYPE(tmp)) {
@ -2739,7 +2737,7 @@ rb_file_join(VALUE ary, VALUE sep)
} }
break; break;
default: default:
StringValueCStr(tmp); tmp = rb_obj_as_string(tmp);
} }
name = StringValueCStr(result); name = StringValueCStr(result);
if (i > 0 && !NIL_P(sep)) { if (i > 0 && !NIL_P(sep)) {
@ -2752,10 +2750,8 @@ rb_file_join(VALUE ary, VALUE sep)
} }
} }
rb_str_buf_append(result, tmp); rb_str_buf_append(result, tmp);
if (OBJ_TAINTED(tmp)) taint = 1;
} }
if (taint) OBJ_TAINT(result);
return result; return result;
} }
@ -2828,7 +2824,6 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
#endif #endif
return INT2FIX(0); return INT2FIX(0);
} }
int recur;
/* /*
* call-seq: * call-seq: