diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-09 02:58:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-09 02:58:45 +0000 |
| commit | b3265c0ed6d7a2db76c172aef128445902c36c63 (patch) | |
| tree | bb77d7444b5db7b2119a90691cf38e03e4ce0bdf | |
| parent | b0c40fca240dec15e8d709f14115d94ef6766c1b (diff) | |
marshal.c: check for prepended
* marshal.c (w_extended): check for prepended object.
[ruby-core:53206] [Bug #8043]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | marshal.c | 9 | ||||
| -rw-r--r-- | test/ruby/marshaltestlib.rb | 5 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Mar 9 11:58:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (w_extended): check for prepended object. + [ruby-core:53206] [Bug #8043] + Sat Mar 9 08:36:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (features_index_add_single, rb_feature_p): store single index @@ -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 45c94e0f15..665d365a9a 100644 --- a/test/ruby/marshaltestlib.rb +++ b/test/ruby/marshaltestlib.rb @@ -365,6 +365,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 |