From 723038b0ba1a6fac881ceacdfc0ff01375eedc10 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 27 Oct 2011 07:10:53 +0000 Subject: [PATCH] * bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is zero, as well as Fixnum. [ruby-core:40429] [Bug #5490] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 4 +++- test/ruby/test_bignum.rb | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea24306483..0997ea62a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 27 16:10:46 2011 Nobuyoshi Nakada + + * bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is + zero, as well as Fixnum. [ruby-core:40429] [Bug #5490] + Thu Oct 27 14:56:22 2011 Nobuyoshi Nakada * configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable. diff --git a/bignum.c b/bignum.c index a618caeb37..db7215ac15 100644 --- a/bignum.c +++ b/bignum.c @@ -2774,7 +2774,9 @@ rb_big_divide(VALUE x, VALUE y, ID op) case T_FLOAT: { - double div = rb_big2dbl(x) / RFLOAT_VALUE(y); + double div, dy = RFLOAT_VALUE(y); + if (dy == 0.0) rb_num_zerodiv(); + div = rb_big2dbl(x) / dy; if (op == '/') { return DBL2NUM(div); } diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb index 5458f0cf4a..9256c7f3f4 100644 --- a/test/ruby/test_bignum.rb +++ b/test/ruby/test_bignum.rb @@ -272,6 +272,9 @@ class TestBignum < Test::Unit::TestCase assert_equal(T32.to_f, T32 / 1.0) assert_raise(TypeError) { T32 / "foo" } assert_equal(0x20000000, 0x40000001.div(2.0), "[ruby-dev:34553]") + bug5490 = '[ruby-core:40429]' + assert_raise(ZeroDivisionError, bug5490) {T1024.div(0)} + assert_raise(ZeroDivisionError, bug5490) {T1024.div(0.0)} end def test_idiv