diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 07:25:37 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 07:25:37 +0000 |
commit | 3f8c4ba70f9aaa401f1b943b7ab30e2685d7078e (patch) | |
tree | c68d03c49685ed9055a9058a97267dbf0afdb551 | |
parent | 63da304fb7c849e675e762c626e074d130d1e715 (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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | file.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Feb 6 16:21:57 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * file.c (file_expand_path): reset coderange after expanding path. + Mon Feb 6 00:06:39 2012 NARUSE, Yui <naruse@ruby-lang.org> * ext/json/parser/parser.rl (json_string_unescape): workaround fix @@ -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; } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 32 +#define RUBY_PATCHLEVEL 33 #define RUBY_RELEASE_DATE "2012-02-06" #define RUBY_RELEASE_YEAR 2012 |