kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rational.c: check load

Browse source 
* rational.c (nurat_loader, nurat_marshal_load): check if loading
  values are Integer.  [ruby-core:78071] [Bug #12918]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-11-11 07:26:14 +00:00
parent 0f9ce57b86
commit e41ebc50dc
2 changed files with 40 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

58
rational.c
View file

@ -485,21 +485,24 @@ nurat_int_value(VALUE num)
return num; return num;
} }
static void
nurat_canonicalize(VALUE *num, VALUE *den)
{
if (f_negative_p(*den)) {
*num = f_negate(*num);
*den = f_negate(*den);
}
else if (f_zero_p(*den)) {
rb_raise_zerodiv();
}
}
inline static VALUE inline static VALUE
nurat_s_canonicalize_internal(VALUE klass, VALUE num, VALUE den) nurat_s_canonicalize_internal(VALUE klass, VALUE num, VALUE den)
{ {
VALUE gcd; VALUE gcd;
switch (FIX2INT(f_cmp(den, ZERO))) { nurat_canonicalize(&num, &den);
case -1:
num = f_negate(num);
den = f_negate(den);
break;
case 0:
rb_raise_zerodiv();
break;
}
gcd = f_gcd(num, den); gcd = f_gcd(num, den);
num = f_idiv(num, gcd); num = f_idiv(num, gcd);
den = f_idiv(den, gcd); den = f_idiv(den, gcd);
@ -514,15 +517,7 @@ nurat_s_canonicalize_internal(VALUE klass, VALUE num, VALUE den)
inline static VALUE inline static VALUE
nurat_s_canonicalize_internal_no_reduce(VALUE klass, VALUE num, VALUE den) nurat_s_canonicalize_internal_no_reduce(VALUE klass, VALUE num, VALUE den)
{ {
switch (FIX2INT(f_cmp(den, ZERO))) { nurat_canonicalize(&num, &den);
case -1:
num = f_negate(num);
den = f_negate(den);
break;
case 0:
rb_raise_zerodiv();
break;
}
#ifdef CANON #ifdef CANON
if (f_one_p(den) && canonicalization) if (f_one_p(den) && canonicalization)
@ -1675,10 +1670,16 @@ nurat_dumper(VALUE self)
static VALUE static VALUE
nurat_loader(VALUE self, VALUE a) nurat_loader(VALUE self, VALUE a)
{ {
get_dat1(self); VALUE num, den;
RRATIONAL_SET_NUM(dat, rb_ivar_get(a, id_i_num)); get_dat1(self);
RRATIONAL_SET_DEN(dat, rb_ivar_get(a, id_i_den)); num = rb_ivar_get(a, id_i_num);
den = rb_ivar_get(a, id_i_den);
nurat_int_check(num);
nurat_int_check(den);
nurat_canonicalize(&num, &den);
RRATIONAL_SET_NUM(dat, num);
RRATIONAL_SET_DEN(dat, den);
return self; return self;
} }
@ -1699,17 +1700,22 @@ nurat_marshal_dump(VALUE self)
static VALUE static VALUE
nurat_marshal_load(VALUE self, VALUE a) nurat_marshal_load(VALUE self, VALUE a)
{ {
VALUE num, den;
rb_check_frozen(self); rb_check_frozen(self);
rb_check_trusted(self); rb_check_trusted(self);
Check_Type(a, T_ARRAY); Check_Type(a, T_ARRAY);
if (RARRAY_LEN(a) != 2) if (RARRAY_LEN(a) != 2)
rb_raise(rb_eArgError, "marshaled rational must have an array whose length is 2 but %ld", RARRAY_LEN(a)); rb_raise(rb_eArgError, "marshaled rational must have an array whose length is 2 but %ld", RARRAY_LEN(a));
if (f_zero_p(RARRAY_AREF(a, 1)))
rb_raise_zerodiv();
rb_ivar_set(self, id_i_num, RARRAY_AREF(a, 0)); num = RARRAY_AREF(a, 0);
rb_ivar_set(self, id_i_den, RARRAY_AREF(a, 1)); den = RARRAY_AREF(a, 1);
nurat_int_check(num);
nurat_int_check(den);
nurat_canonicalize(&num, &den);
rb_ivar_set(self, id_i_num, num);
rb_ivar_set(self, id_i_den, den);
return self; return self;
} }

8
test/ruby/test_rational.rb
View file

@ -646,6 +646,10 @@ class Rational_Test < Test::Unit::TestCase
assert_equal(9, c2.instance_variable_get(:@ivar)) assert_equal(9, c2.instance_variable_get(:@ivar))
assert_instance_of(Rational, c2) assert_instance_of(Rational, c2)
assert_raise(TypeError){
Marshal.load("\x04\bU:\rRational[\ai\x060")
}
assert_raise(ZeroDivisionError){ assert_raise(ZeroDivisionError){
Marshal.load("\x04\bU:\rRational[\ai\x06i\x05") Marshal.load("\x04\bU:\rRational[\ai\x06i\x05")
} }
@ -664,6 +668,10 @@ class Rational_Test < Test::Unit::TestCase
assert_nothing_raised(bug6625) do assert_nothing_raised(bug6625) do
assert_equal(Rational(1, 2), Marshal.load(dump), bug6625) assert_equal(Rational(1, 2), Marshal.load(dump), bug6625)
end end
dump = "\x04\x08o:\x0dRational\x07:\x11@denominatori\x07:\x0f@numerator0"
assert_raise(TypeError) do
Marshal.load(dump)
end
end end
def test_parse def test_parse