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 --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 316562e320..1d629fd780 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Dec 19 21:12:49 2012 Shugo Maeda + + * marshal.c (r_entry0): don't taint classes and modules because + Marshal.load just returns the dumped classes and modules. + [Bug #7325] [ruby-core:49198] + + * test/ruby/test_marshal.rb: related test. + Tue Dec 11 19:19:33 2012 Luis Lavena * win32/file.c (replace_to_long_name): correct logic around wildcard -- cgit v1.2.3