From 74cfd999b9f03834ccab3a4a7f9383d56afa76e5 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 1 Jun 2017 12:43:11 -0700
Subject: [PATCH] 8176847: Calendar.checkDisplayNameParams() should check case
 of style == 3

Reviewed-by: martin
---
 .../share/classes/java/util/Calendar.java     |  4 +-
 jdk/test/java/util/Calendar/Bug8176847.java   | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 jdk/test/java/util/Calendar/Bug8176847.java

diff --git a/jdk/src/java.base/share/classes/java/util/Calendar.java b/jdk/src/java.base/share/classes/java/util/Calendar.java
index 83435a90e9e..5ea332b459e 100644
--- a/jdk/src/java.base/share/classes/java/util/Calendar.java
+++ b/jdk/src/java.base/share/classes/java/util/Calendar.java
@@ -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.
  *
  * 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) {
         int baseStyle = getBaseStyle(style); // Ignore the standalone mask
         if (field < 0 || field >= fields.length ||
-            baseStyle < minStyle || baseStyle > maxStyle) {
+            baseStyle < minStyle || baseStyle > maxStyle || baseStyle == 3) {
             throw new IllegalArgumentException();
         }
         if (locale == null) {
diff --git a/jdk/test/java/util/Calendar/Bug8176847.java b/jdk/test/java/util/Calendar/Bug8176847.java
new file mode 100644
index 00000000000..d5e5c050754
--- /dev/null
+++ b/jdk/test/java/util/Calendar/Bug8176847.java
@@ -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
+        }
+    }
+}