From 798b8d27916adcb3faa87e85e45211340b6bc3a4 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 30 Jul 2007 02:16:42 +0000 Subject: [PATCH] * bignum.c (rb_big_aref): check for Bignum index range. [ruby-dev:31271] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 34 ++++++++++++++++++++++------------ test/ruby/test_integer.rb | 7 +++++++ version.h | 6 +++--- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c08e24911..93532595fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 30 11:16:40 2007 Nobuyoshi Nakada + + * bignum.c (rb_big_aref): check for Bignum index range. + [ruby-dev:31271] + Sat Jul 28 09:35:41 2007 Yukihiro Matsumoto * ext/digest/lib/digest.rb (Digest::self.const_missing): avoid diff --git a/bignum.c b/bignum.c index a0402d7d2d..f4c2015c96 100644 --- a/bignum.c +++ b/bignum.c @@ -2061,29 +2061,39 @@ static VALUE rb_big_aref(VALUE x, VALUE y) { BDIGIT *xds; - int shift; - long s1, s2; + BDIGIT_DBL num; + VALUE shift; + long i, s1, s2; if (TYPE(y) == T_BIGNUM) { - if (!RBIGNUM(y)->sign || RBIGNUM(x)->sign) + if (!RBIGNUM(y)->sign) return INT2FIX(0); - return INT2FIX(1); + if (RBIGNUM(bigtrunc(y))->len > SIZEOF_VALUE/SIZEOF_BDIGITS) { + out_of_range: + return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1); + } + shift = big2ulong(y, "long", Qfalse); + } + else { + i = NUM2LONG(y); + if (i < 0) return INT2FIX(0); + shift = (VALUE)i; } - shift = NUM2INT(y); - if (shift < 0) return INT2FIX(0); s1 = shift/BITSPERDIG; s2 = shift%BITSPERDIG; + if (s1 >= RBIGNUM(x)->len) goto out_of_range; if (!RBIGNUM(x)->sign) { - if (s1 >= RBIGNUM(x)->len) return INT2FIX(1); - x = rb_big_clone(x); - get2comp(x); + xds = BDIGITS(x); + i = 0; num = 1; + while (num += ~xds[i], ++i <= s1) { + num = BIGDN(num); + } } else { - if (s1 >= RBIGNUM(x)->len) return INT2FIX(0); + num = BDIGITS(x)[s1]; } - xds = BDIGITS(x); - if (xds[s1] & (1<