archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r24015 from trunk into ruby_1_9_1.

Browse source 
--
* marshal.c (r_object0): set encoding only if the encoding is not US-ASCII.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-07-13 08:08:02 +00:00
parent 2d6fb10a9c
commit 39c9f447f8
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org>
* marshal.c (r_object0): set encoding only if the encoding
is not US-ASCII.
Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added

3
marshal.c
View file

@ -1376,7 +1376,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
r_ivar(v, arg); r_ivar(v, arg);
*ivp = Qfalse; *ivp = Qfalse;
} }
rb_enc_copy(str, v); if (rb_enc_get_index(v) != rb_usascii_encindex())
rb_enc_copy(str, v);
if (rb_enc_get_index(str) != rb_utf8_encindex()) { if (rb_enc_get_index(str) != rb_utf8_encindex()) {
#define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z) #define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z)
f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u")); f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u"));

2
version.h
View file

@ -4,7 +4,7 @@
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_PATCHLEVEL 228 #define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 12 #define RUBY_RELEASE_DAY 12