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

ruby-changes:50437

From: nobu <ko1@a...>
Date: Sat, 24 Feb 2018 11:08:41 +0900 (JST)
Subject: [ruby-changes:50437] nobu:r62555 (trunk): rational.c: segfault on Rational exponent

nobu	2018-02-24 11:08:36 +0900 (Sat, 24 Feb 2018)

  New Revision: 62555

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62555

  Log:
    rational.c: segfault on Rational exponent
    
    * rational.c (read_num): fix segfault on Rational() with positive
      but less than the length of fractional part exponent.  should be
      negated to convert to divisor which is a reciprocal.
      [ruby-core:85783] [Bug #14547]

  Modified files:
    trunk/rational.c
    trunk/test/ruby/test_rational.rb
Index: test/ruby/test_rational.rb
===================================================================
--- test/ruby/test_rational.rb	(revision 62554)
+++ test/ruby/test_rational.rb	(revision 62555)
@@ -110,6 +110,10 @@ class Rational_Test < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/test/ruby/test_rational.rb#L110
     assert_equal(Rational(3),Rational('3'))
     assert_equal(Rational(1),Rational('3.0','3.0'))
     assert_equal(Rational(1),Rational('3/3','3/3'))
+    assert_equal(Rational(111, 10), Rational('1.11e+1'))
+    assert_equal(Rational(111, 10), Rational('1.11e1'))
+    assert_equal(Rational(111, 100), Rational('1.11e0'))
+    assert_equal(Rational(111, 1000), Rational('1.11e-1'))
     assert_raise(TypeError){Rational(nil)}
     assert_raise(ArgumentError){Rational('')}
     assert_raise_with_message(ArgumentError, /\u{221a 2668}/) {
Index: rational.c
===================================================================
--- rational.c	(revision 62554)
+++ rational.c	(revision 62555)
@@ -2368,6 +2368,18 @@ islettere(int c) https://github.com/ruby/ruby/blob/trunk/rational.c#L2368
     return (c == 'e' || c == 'E');
 }
 
+static VALUE
+negate_num(VALUE num)
+{
+    if (FIXNUM_P(num)) {
+	return rb_int_uminus(num);
+    }
+    else {
+	BIGNUM_NEGATE(num);
+	return rb_big_norm(num);
+    }
+}
+
 static int
 read_num(const char **s, const char *const end, VALUE *num, VALUE *div)
 {
@@ -2422,7 +2434,7 @@ read_num(const char **s, const char *con https://github.com/ruby/ruby/blob/trunk/rational.c#L2434
 	    else {
 		if (fn != ZERO) exp = rb_int_minus(exp, fn);
 		if (INT_NEGATIVE_P(exp)) {
-		    *div = f_expt10(exp);
+		    *div = f_expt10(negate_num(exp));
 		}
 		else {
 		    *num = rb_int_mul(n, f_expt10(exp));
@@ -2483,13 +2495,7 @@ parse_rat(const char *s, const char *con https://github.com/ruby/ruby/blob/trunk/rational.c#L2495
     }
 
     if (sign == '-') {
-	if (FIXNUM_P(num)) {
-	    num = rb_int_uminus(num);
-	}
-	else {
-	    BIGNUM_NEGATE(num);
-	    num = rb_big_norm(num);
-	}
+	num = negate_num(num);
     }
 
     if (!canonicalization || den != ONE)

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

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