1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8235699: ArrayIndexOutOfBoundsException in CalendarBuilder.toString

Browse Source 
Reviewed-by: phh, alanb, weijun, simonis, rriggs
This commit is contained in:
Clive Verghese 2020-02-05 16:39:45 +01:00 committed by Volker Simonis
parent ccb4ab5499
commit e7e182a318
3 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.base/share/classes/java/text/CalendarBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2020, 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
@ -148,9 +148,9 @@ class CalendarBuilder {
public String toString() { public String toString() {
StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]"); StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]");
for (int i = 0; i < field.length; i++) { for (int i = 0; i < MAX_FIELD; i++) {
if (isSet(i)) { if (isSet(i)) {
sj.add(i + "=" + field[MAX_FIELD + i]); sj.add(i + "=" + field[i] + ":" + field[MAX_FIELD + i]);
} }
} }
return sj.toString(); return sj.toString();

37
test/jdk/java/text/Format/DateFormat/Bug8235699.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2020, Amazon 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 8235699
* @summary Check that CalendarBuilder.toString() does not throw an ArrayIndexOutOfBoundException
* @build java.base/java.text.CalendarBuilderTest
* @run main Bug8235699
*/
public class Bug8235699 {
public static void main(String[] args) {
java.text.CalendarBuilderTest.testCalendarBuilderToString();
}
}

39
test/jdk/java/text/Format/DateFormat/java.base/java/text/CalendarBuilderTest.java Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (c) 2020, Amazon 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.
*/
package java.text;
/**
* Test validated that CalendarBuilder.toString does not throw an ArrayIndexOutOfBoundException.
*/
import java.util.Calendar;
public class CalendarBuilderTest {
public static void testCalendarBuilderToString() {
CalendarBuilder calendarBuilder = new CalendarBuilder();
calendarBuilder.set(Calendar.YEAR, 2020);
calendarBuilder.toString();
}
}