From c2485d5f7dd00eaed34a5d309276114eb4c78cb0 Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Tue, 29 Apr 2025 19:12:52 +0000
Subject: [PATCH] 8351113: RC2ParameterSpec throws IllegalArgumentException
 when offset is negative

Reviewed-by: mullan
---
 .../javax/crypto/spec/RC2ParameterSpec.java   |  7 +++-
 .../RC2ParameterSpec/InvalidArrayIndex.java   | 40 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java

diff --git a/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
index e37e3872ff2..0e664510324 100644
--- a/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
@@ -98,7 +98,12 @@ public class RC2ParameterSpec implements AlgorithmParameterSpec {
      */
     public RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) {
         this.effectiveKeyBits = effectiveKeyBits;
-        if (iv == null) throw new IllegalArgumentException("IV missing");
+        if (iv == null) {
+            throw new IllegalArgumentException("IV missing");
+        }
+        if (offset < 0) {
+            throw new ArrayIndexOutOfBoundsException("offset is negative");
+        }
         int blockSize = 8;
         if (iv.length - offset < blockSize) {
             throw new IllegalArgumentException("IV too short");
diff --git a/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java b/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java
new file mode 100644
index 00000000000..0a2dcecb76d
--- /dev/null
+++ b/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025, 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 8351113
+ * @summary check for negative offset
+ * @library /test/lib
+ */
+
+import jdk.test.lib.Utils;
+import javax.crypto.spec.RC2ParameterSpec;
+
+public class InvalidArrayIndex {
+
+    public static void main(String[] args) throws Exception {
+        Utils.runAndCheckException(() -> new RC2ParameterSpec(0, new byte[20],
+                Integer.MIN_VALUE), ArrayIndexOutOfBoundsException.class);
+    }
+}