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

8176847: Calendar.checkDisplayNameParams() should check case of style == 3

Browse Source 
Reviewed-by: martin
This commit is contained in:
Naoto Sato 2017-06-01 12:43:11 -07:00
parent a449b10079
commit 74cfd999b9
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/java/util/Calendar.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -2216,7 +2216,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
Locale locale, int fieldMask) { Locale locale, int fieldMask) {
int baseStyle = getBaseStyle(style); // Ignore the standalone mask int baseStyle = getBaseStyle(style); // Ignore the standalone mask
if (field < 0 || field >= fields.length || if (field < 0 || field >= fields.length ||
baseStyle < minStyle || baseStyle > maxStyle) { baseStyle < minStyle || baseStyle > maxStyle || baseStyle == 3) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
if (locale == null) { if (locale == null) {

52
jdk/test/java/util/Calendar/Bug8176847.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright (c) 2017, 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 8176847
* @summary Make sure that style value of '3' throws IllegalArgumentException
* in Calendar.getDisplayName(s) methods.
*/
import java.util.Calendar;
import java.util.Locale;
public class Bug8176847 {
public static void main(String[] args) {
Calendar c = new Calendar.Builder().build();
try {
c.getDisplayName(Calendar.MONTH, 3, Locale.US);
throw new RuntimeException("IllegalArgumentException was not thrown");
} catch (IllegalArgumentException iae) {
// success
}
try {
c.getDisplayNames(Calendar.MONTH, 3, Locale.US);
throw new RuntimeException("IllegalArgumentException was not thrown");
} catch (IllegalArgumentException iae) {
// success
}
}
}