diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-03 17:11:47 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-03 17:11:47 +0000 |
commit | 279b256dd0a94aafabf664c3b0fef44d4370ee5e (patch) | |
tree | 3af7cfe1f050cd9dafdbf9408a607c2813936cf0 | |
parent | a85a0ddf0a2d72cb9aa7bea6be4a5d0034b3bfd8 (diff) |
merge revision(s) 39650: [Backport #8043]
* marshal.c (w_extended): check for prepended object.
[ruby-core:53206] [Bug #8043]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 9 | ||||
-rw-r--r-- | test/ruby/marshaltestlib.rb | 5 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Apr 4 02:11:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (w_extended): check for prepended object. + [ruby-core:53206] [Bug #8043] + Wed Mar 27 03:02:30 2013 NARUSE, Yui <naruse@ruby-lang.org> * vm_exec.c: Correct predefined macro name. This typo is introduced by @@ -457,12 +457,17 @@ hash_each(VALUE key, VALUE value, struct dump_call_arg *arg) return ST_CONTINUE; } +#define SINGLETON_DUMP_UNABLE_P(klass) \ + (RCLASS_M_TBL(klass)->num_entries || \ + (RCLASS_IV_TBL(klass) && RCLASS_IV_TBL(klass)->num_entries > 1)) + static void w_extended(VALUE klass, struct dump_arg *arg, int check) { if (check && FL_TEST(klass, FL_SINGLETON)) { - if (RCLASS_M_TBL(klass)->num_entries || - (RCLASS_IV_TBL(klass) && RCLASS_IV_TBL(klass)->num_entries > 1)) { + VALUE origin = RCLASS_ORIGIN(klass); + if (SINGLETON_DUMP_UNABLE_P(klass) || + (origin != klass && SINGLETON_DUMP_UNABLE_P(origin))) { rb_raise(rb_eTypeError, "singleton can't be dumped"); } klass = RCLASS_SUPER(klass); diff --git a/test/ruby/marshaltestlib.rb b/test/ruby/marshaltestlib.rb index c8f81da35c..27b0949518 100644 --- a/test/ruby/marshaltestlib.rb +++ b/test/ruby/marshaltestlib.rb @@ -386,6 +386,11 @@ module MarshalTestLib o = Object.new def o.m() end assert_raise(TypeError) { marshaltest(o) } + + bug8043 = '[ruby-core:53206] [Bug #8043]' + class << o; prepend Mod1; end + assert_raise(TypeError, bug8043) {marshaltest(o)} + o = Object.new c = class << o @v = 1 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-04-03" -#define RUBY_PATCHLEVEL 102 +#define RUBY_RELEASE_DATE "2013-04-04" +#define RUBY_PATCHLEVEL 103 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" |