From b5cd43c998038156ecf5fc28e5138b7f88b9aafe Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 30 May 2010 19:03:47 +0000 Subject: * file.c (file_expand_path): check if expanded dname encoding is compatible with fname, not just copying. [ruby-core:30516] * test/ruby/test_beginendblock.rb (test_endblockwarn): needs encoding comment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 86ea3d67fa..ecf2583609 100644 --- a/file.c +++ b/file.c @@ -2887,7 +2887,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) xfree(dir); rb_enc_associate_index(result, rb_filesystem_encindex()); } - else rb_enc_copy(result, fname); + else rb_enc_check(result, fname); p = chompdirsep(skiproot(buf)); s += 2; } @@ -2897,7 +2897,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) if (!NIL_P(dname)) { file_expand_path(dname, Qnil, abs_mode, result); BUFINIT(); - rb_enc_copy(result, fname); + rb_enc_check(result, fname); } else { char *dir = my_getcwd(); -- cgit v1.2.3