From 3432474c906343d4a739a860c32371124def0349 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 13 Dec 2012 05:02:55 +0000 Subject: * file.c (rb_file_join): check encoding compatibility before joining strings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index c14fed5908..548eaddfa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 13 14:02:15 2012 NAKAMURA Usaku + + * file.c (rb_file_join): check encoding compatibility before joining + strings. + Thu Dec 13 13:06:27 2012 Nobuyoshi Nakada * proc.c (umethod_bind): allow another form of method transplanting diff --git a/file.c b/file.c index 88a7065cf7..2aa896ae47 100644 --- a/file.c +++ b/file.c @@ -3940,6 +3940,7 @@ rb_file_join(VALUE ary, VALUE sep) VALUE result, tmp; const char *name, *tail; int checked = TRUE; + rb_encoding *enc; if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0); @@ -3994,10 +3995,14 @@ rb_file_join(VALUE ary, VALUE sep) rb_str_set_len(result, tail - name); } else if (!*tail) { + enc = rb_enc_check(result, sep); rb_str_buf_append(result, sep); + rb_enc_associate(result, enc); } } + enc = rb_enc_check(result, tmp); rb_str_buf_append(result, tmp); + rb_enc_associate(result, enc); } RBASIC(result)->klass = rb_cString; -- cgit v1.2.3