From 60e7104fd8978c9ea9feae021151bab9314485b6 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 19 Dec 2012 12:13:19 +0000 Subject: merge revision(s) 38357,38363: [Backport #7325] * marshal.c (r_entry0): don't taint classes and modules because Marshal.load just return the dumped classes and modules. [Bug #7325] [ruby-core:49198] * test/ruby/test_marshal.rb: related test. Marshal.load just returns the dumped classes and modules. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index 9a43cdb4d1..6ae3a55635 100644 --- a/marshal.c +++ b/marshal.c @@ -1214,7 +1214,8 @@ r_entry0(VALUE v, st_index_t num, struct load_arg *arg) else { st_insert(arg->data, num, (st_data_t)v); } - if (arg->infection) { + if (arg->infection && + TYPE(v) != T_CLASS && TYPE(v) != T_MODULE) { FL_SET(v, arg->infection); if ((VALUE)real_obj != Qundef) FL_SET((VALUE)real_obj, arg->infection); -- cgit v1.2.3