1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marshal.c: no duplicated encoding

Browse Source 
* marshal.c (w_object): do not dump encoding which is dumped with
  marshal_dump data.  [ruby-core:54334] [Bug #8276]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-19 04:03:29 +00:00
parent 597aa8bafb
commit 1dd06612a5
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Apr 19 13:03:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object): do not dump encoding which is dumped with
marshal_dump data. [ruby-core:54334] [Bug #8276]
Fri Apr 19 11:36:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 19 11:36:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (stack_protector): control use of -fstack-protector. * configure.in (stack_protector): control use of -fstack-protector.

5
marshal.c
View File

@ -598,7 +598,8 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
st_table *ivtbl = 0; st_table *ivtbl = 0;
st_data_t num; st_data_t num;
int hasiv = 0; int hasiv = 0;
#define has_ivars(obj, ivtbl) (((ivtbl) = rb_generic_ivar_table(obj)) != 0 || \ #define has_ivars_noenc(obj, ivtbl) (((ivtbl) = rb_generic_ivar_table(obj)) != 0)
#define has_ivars(obj, ivtbl) (has_ivars_noenc(obj, ivtbl) || \
(!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj))) (!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj)))
if (limit == 0) { if (limit == 0) {
@ -656,7 +657,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
v = rb_funcall2(obj, s_mdump, 0, 0); v = rb_funcall2(obj, s_mdump, 0, 0);
check_dump_arg(arg, s_mdump); check_dump_arg(arg, s_mdump);
hasiv = has_ivars(v, ivtbl); hasiv = has_ivars_noenc(v, ivtbl);
if (hasiv) w_byte(TYPE_IVAR, arg); if (hasiv) w_byte(TYPE_IVAR, arg);
w_class(TYPE_USRMARSHAL, obj, arg, FALSE); w_class(TYPE_USRMARSHAL, obj, arg, FALSE);
w_object(v, arg, limit); w_object(v, arg, limit);

18
test/ruby/test_marshal.rb
View File

@ -539,6 +539,24 @@ class TestMarshal < Test::Unit::TestCase
assert_nil(loaded.foo, bug7627) assert_nil(loaded.foo, bug7627)
end end
class Bug8276
attr_reader :data
def initialize(data)
@data = data
freeze
end
alias marshal_dump data
alias marshal_load initialize
end
def test_marshal_dump_excess_encoding
bug8276 = '[ruby-core:54334] [Bug #8276]'
t = Bug8276.new(bug8276)
s = Marshal.dump(t)
assert_nothing_raised(RuntimeError) {s = Marshal.load(s)}
assert_equal(t.data, s.data, bug8276)
end
def test_class_ivar def test_class_ivar
assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08Ic\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}
assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")} assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1bTestMarshal::TestClass\x06:\x0e@ivar_bug\"\x08bug")}