From 870df461dd3008dd56c0147ddc2fd84688cdd9cb Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 10:57:55 +0000 Subject: merge revision(s) 15575: * bignum.c (BIGZEROP): fix for longer Bignum zeros. [ruby-Bugs-17454] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bignum.c | 16 +++++++++++++++- version.h | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74e37e2292..14cc981a6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 15 19:56:53 2008 Nobuyoshi Nakada + + * bignum.c (BIGZEROP): fix for longer Bignum zeros. [ruby-Bugs-17454] + Sun Jun 15 19:54:21 2008 Nobuyoshi Nakada * bignum.c (big2str_find_n1): check integer overflow. diff --git a/bignum.c b/bignum.c index 70a88e64d9..e3d531ceaf 100644 --- a/bignum.c +++ b/bignum.c @@ -36,7 +36,21 @@ VALUE rb_cBignum; #define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1))) #define BDIGMAX ((BDIGIT)-1) -#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || (RBIGNUM(x)->len == 1 && BDIGITS(x)[0] == 0)) +#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \ + (BDIGITS(x)[0] == 0 && \ + (RBIGNUM(x)->len == 1 || bigzero_p(x)))) + +static int bigzero_p(VALUE); +static int +bigzero_p(x) + VALUE x; +{ + long i; + for (i = 0; i < RBIGNUM(x)->len; ++i) { + if (BDIGITS(x)[i]) return 0; + } + return 1; +} static VALUE bignew_1(klass, len, sign) diff --git a/version.h b/version.h index 73b3fa9510..7ed231747d 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 184 +#define RUBY_PATCHLEVEL 185 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3