[前][次][番号順一覧][スレッド一覧]

ruby-changes:21487

From: nobu <ko1@a...>
Date: Thu, 27 Oct 2011 16:11:07 +0900 (JST)
Subject: [ruby-changes:21487] nobu:r33536 (trunk): * bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is

nobu	2011-10-27 16:10:53 +0900 (Thu, 27 Oct 2011)

  New Revision: 33536

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33536

  Log:
    * bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is
      zero, as well as Fixnum.  [ruby-core:40429] [Bug #5490]

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/test/ruby/test_bignum.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33535)
+++ ChangeLog	(revision 33536)
@@ -1,3 +1,8 @@
+Thu Oct 27 16:10:46 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <nobu@r...>
 
 	* configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.
Index: bignum.c
===================================================================
--- bignum.c	(revision 33535)
+++ bignum.c	(revision 33536)
@@ -2774,7 +2774,9 @@
 
       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);
 	    }
Index: test/ruby/test_bignum.rb
===================================================================
--- test/ruby/test_bignum.rb	(revision 33535)
+++ test/ruby/test_bignum.rb	(revision 33536)
@@ -272,6 +272,9 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]