archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34803:

Browse source 
* complex.c (nucomp_marshal_load): raise error on invalid data.
	  reported by John Firebaugh [ruby-core:42860] [Bug #6076]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-25 07:39:32 +00:00
parent 76dc4b9a24
commit 7e2e3dc85d
5 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Feb 25 16:39:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
* complex.c (nucomp_marshal_load): raise error on invalid data.
reported by John Firebaugh [ruby-core:42860] [Bug #6076]
Fri Feb 24 23:49:05 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Fri Feb 24 23:49:05 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/ostruct.rb (delete_field): Bug fix so previous value is * lib/ostruct.rb (delete_field): Bug fix so previous value is

2
complex.c
View file

@ -1260,6 +1260,8 @@ nucomp_marshal_load(VALUE self, VALUE a)
{ {
get_dat1(self); get_dat1(self);
Check_Type(a, T_ARRAY); Check_Type(a, T_ARRAY);
if (RARRAY_LEN(a) != 2)
rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
dat->real = RARRAY_PTR(a)[0]; dat->real = RARRAY_PTR(a)[0];
dat->imag = RARRAY_PTR(a)[1]; dat->imag = RARRAY_PTR(a)[1];
rb_copy_generic_ivar(self, a); rb_copy_generic_ivar(self, a);

2
rational.c
View file

@ -1606,6 +1606,8 @@ nurat_marshal_load(VALUE self, VALUE a)
{ {
get_dat1(self); get_dat1(self);
Check_Type(a, T_ARRAY); Check_Type(a, T_ARRAY);
if (RARRAY_LEN(a) != 2)
rb_raise(rb_eArgError, "marshaled rational must have an array whose length is 2 but %ld", RARRAY_LEN(a));
dat->num = RARRAY_PTR(a)[0]; dat->num = RARRAY_PTR(a)[0];
dat->den = RARRAY_PTR(a)[1]; dat->den = RARRAY_PTR(a)[1];
rb_copy_generic_ivar(self, a); rb_copy_generic_ivar(self, a);

14
test/ruby/test_marshal.rb
View file

@ -469,4 +469,18 @@ class TestMarshal < Test::Unit::TestCase
assert_equal(o1.class, o2.class) assert_equal(o1.class, o2.class)
assert_equal(o1.foo, o2.foo) assert_equal(o1.foo, o2.foo)
end end
def test_marshal_complex
assert_raise(ArgumentError){Marshal.load("\x04\bU:\fComplex[\x05")}
assert_raise(ArgumentError){Marshal.load("\x04\bU:\fComplex[\x06i\x00")}
assert_equal(Complex(1, 2), Marshal.load("\x04\bU:\fComplex[\ai\x06i\a"))
assert_raise(ArgumentError){Marshal.load("\x04\bU:\fComplex[\bi\x00i\x00i\x00")}
end
def test_marshal_rational
assert_raise(ArgumentError){Marshal.load("\x04\bU:\rRational[\x05")}
assert_raise(ArgumentError){Marshal.load("\x04\bU:\rRational[\x06i\x00")}
assert_equal(Rational(1, 2), Marshal.load("\x04\bU:\rRational[\ai\x06i\a"))
assert_raise(ArgumentError){Marshal.load("\x04\bU:\rRational[\bi\x00i\x00i\x00")}
end
end end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 143 #define RUBY_PATCHLEVEL 144
#define RUBY_RELEASE_DATE "2012-02-24" #define RUBY_RELEASE_DATE "2012-02-25"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 24 #define RUBY_RELEASE_DAY 25
#include "ruby/version.h" #include "ruby/version.h"