aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-29 00:35:57 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-29 00:35:57 +0000
commitc6cb7416d21e348a44cf17dad0c603d1c6a23a8b (patch)
tree382859fdeb81f7b80e424bcb3e3606c826733cdb
parentf0454052f71ad1efad04f6a2e029f18e468af563 (diff)
downloadruby-c6cb7416d21e348a44cf17dad0c603d1c6a23a8b.tar.gz
* bignum.c (bigor_int): Return -1 if y == -1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bignum.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e0ffdba41c..d8c1d0bb5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 29 09:33:53 2013 Tanaka Akira <akr@fsij.org>
+
+ * bignum.c (bigor_int): Return -1 if y == -1.
+
Sat Jun 29 09:07:16 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bigor_int): Use RB_GC_GUARD.
diff --git a/bignum.c b/bignum.c
index cfc6665dad..aab97fae42 100644
--- a/bignum.c
+++ b/bignum.c
@@ -4774,7 +4774,7 @@ bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
long i;
BDIGIT hibitsy;
- if (y == -1) INT2FIX(-1);
+ if (y == -1) return INT2FIX(-1);
if (xn == 0) return hibitsx ? INT2FIX(-1) : LONG2FIX(y);
hibitsy = 0 <= y ? 0 : BDIGMAX;
xds = BDIGITS(x);