6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError
Reviewed-by: alanb
This commit is contained in:
parent
562fb9a67f
commit
589f5d20cb
@ -2051,6 +2051,8 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
|
||||
*
|
||||
* @param n shift distance, in bits.
|
||||
* @return {@code this << n}
|
||||
* @throws ArithmeticException if the shift distance is {@code
|
||||
* Integer.MIN_VALUE}.
|
||||
* @see #shiftRight
|
||||
*/
|
||||
public BigInteger shiftLeft(int n) {
|
||||
@ -2058,8 +2060,13 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
|
||||
return ZERO;
|
||||
if (n==0)
|
||||
return this;
|
||||
if (n<0)
|
||||
return shiftRight(-n);
|
||||
if (n<0) {
|
||||
if (n == Integer.MIN_VALUE) {
|
||||
throw new ArithmeticException("Shift distance of Integer.MIN_VALUE not supported.");
|
||||
} else {
|
||||
return shiftRight(-n);
|
||||
}
|
||||
}
|
||||
|
||||
int nInts = n >>> 5;
|
||||
int nBits = n & 0x1f;
|
||||
@ -2097,13 +2104,20 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
|
||||
*
|
||||
* @param n shift distance, in bits.
|
||||
* @return {@code this >> n}
|
||||
* @throws ArithmeticException if the shift distance is {@code
|
||||
* Integer.MIN_VALUE}.
|
||||
* @see #shiftLeft
|
||||
*/
|
||||
public BigInteger shiftRight(int n) {
|
||||
if (n==0)
|
||||
return this;
|
||||
if (n<0)
|
||||
return shiftLeft(-n);
|
||||
if (n<0) {
|
||||
if (n == Integer.MIN_VALUE) {
|
||||
throw new ArithmeticException("Shift distance of Integer.MIN_VALUE not supported.");
|
||||
} else {
|
||||
return shiftLeft(-n);
|
||||
}
|
||||
}
|
||||
|
||||
int nInts = n >>> 5;
|
||||
int nBits = n & 0x1f;
|
||||
|
48
jdk/test/java/math/BigInteger/ExtremeShiftingTests.java
Normal file
48
jdk/test/java/math/BigInteger/ExtremeShiftingTests.java
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6371401
|
||||
* @summary Tests of shiftLeft and shiftRight on Integer.MIN_VALUE
|
||||
* @author Joseph D. Darcy
|
||||
*/
|
||||
import static java.math.BigInteger.*;
|
||||
|
||||
public class ExtremeShiftingTests {
|
||||
public static void main(String... args) {
|
||||
try {
|
||||
ONE.shiftLeft(Integer.MIN_VALUE);
|
||||
throw new RuntimeException("Should not reach here.");
|
||||
} catch (ArithmeticException ae) {
|
||||
; // Expected
|
||||
}
|
||||
|
||||
try {
|
||||
ONE.shiftRight(Integer.MIN_VALUE);
|
||||
throw new RuntimeException("Should not reach here.");
|
||||
} catch (ArithmeticException ae) {
|
||||
; // Expected
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user