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

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cae97599a..3014fd89b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
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;
 }
 
diff --git a/version.h b/version.h
index ec8bc0aa23..0acef7be33 100644
--- a/version.h
+++ b/version.h
@@ -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