stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8196740: Character.digit(int,int) returns wrong value for out of range radix

Browse Source 
Reviewed-by: redestad
This commit is contained in:
Ivan Gerasimov 2018-02-03 21:12:37 -08:00
parent 3e53369eb8
commit 831b32b2a9
2 changed files with 71 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/data/characterdata/CharacterDataLatin1.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. 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
@ -25,8 +25,6 @@
package java.lang;
import java.util.Arrays;
/** The CharacterData class encapsulates the large tables found in
Java.lang.Character. */
@ -190,10 +188,8 @@ class CharacterDataLatin1 extends CharacterData {
int digit(int ch, int radix) {
int value = DIGITS[ch];
if (value >= 0 && radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
value = (value < radix) ? value : -1;
}
return value;
return (value >= 0 && value < radix && radix >= Character.MIN_RADIX
&& radix <= Character.MAX_RADIX) ? value : -1;
}
int getNumericValue(int ch) {

68
test/jdk/java/lang/Character/Latin1Digit.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 8196740
* @summary Check j.l.Character.digit(int,int) for Latin1 characters
*/
public class Latin1Digit {
public static void main(String[] args) throws Exception {
for (int ch = 0; ch < 256; ++ch) {
for (int radix = -256; radix <= 256; ++radix) {
test(ch, radix);
}
test(ch, Integer.MIN_VALUE);
test(ch, Integer.MAX_VALUE);
}
}
static void test(int ch, int radix) throws Exception {
int d1 = Character.digit(ch, radix);
int d2 = canonicalDigit(ch, radix);
if (d1 != d2) {
throw new Exception("Wrong result for char="
+ ch + " (" + (char)ch + "), radix="
+ radix + "; " + d1 + " != " + d2);
}
}
// canonical version of Character.digit(int,int) for Latin1
static int canonicalDigit(int ch, int radix) {
if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) {
return -1;
}
if (ch >= '0' && ch <= '9' && ch < (radix + '0')) {
return ch - '0';
}
if (ch >= 'A' && ch <= 'Z' && ch < (radix + 'A' - 10)) {
return ch - 'A' + 10;
}
if (ch >= 'a' && ch <= 'z' && ch < (radix + 'a' - 10)) {
return ch - 'a' + 10;
}
return -1;
}
}