kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 33603:

Browse source 
* 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
This commit is contained in:
usa 2012-02-06 07:25:37 +00:00
parent 63da304fb7
commit 3f8c4ba70f
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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

1
file.c
View file

@ -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;
}

2
version.h
View file

@ -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