summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 07:25:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 07:25:37 +0000
commit3f8c4ba70f9aaa401f1b943b7ab30e2685d7078e (patch)
treec68d03c49685ed9055a9058a97267dbf0afdb551 /file.c
parent63da304fb7c849e675e762c626e074d130d1e715 (diff)
merge revision(s) 33603:
* file.c (file_expand_path): reset coderange after expanding path. [Backport #5601] [Backport #5629] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/file.c b/file.c
index 81f28ffa03..63f94c532b 100644
--- a/file.c
+++ b/file.c
@@ -3176,6 +3176,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
if (tainted) OBJ_TAINT(result);
rb_str_set_len(result, p - buf);
rb_enc_check(fname, result);
+ ENC_CODERANGE_CLEAR(result);
return result;
}