file.c: ASCII-compatible

* file.c (rb_file_join): check nul-byte only for strings, since
  FilePathStringValue() does it.  [ruby-core:48012] [Bug #7168]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index f4ae1bb155..8ffd874a9c 100644
--- a/file.c
+++ b/file.c
@@ -3941,6 +3941,7 @@ rb_file_join(VALUE ary, VALUE sep)
 	tmp = RARRAY_PTR(ary)[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
+	    StringValueCStr(tmp);
 	    break;
 	  case T_ARRAY:
 	    if (ary == tmp) {
@@ -3957,8 +3958,7 @@ rb_file_join(VALUE ary, VALUE sep)
 	  default:
 	    FilePathStringValue(tmp);
 	}
-	name = StringValueCStr(result);
-	len = RSTRING_LEN(result);
+	RSTRING_GETMEM(result, name, len);
 	if (i == 0) {
 	    rb_enc_copy(result, tmp);
 	}