From 120f161ddd078d35a19c28ce979bce30c81e886a Mon Sep 17 00:00:00 2001
From: prrace <philip.race@oracle.com>
Date: Tue, 27 Jan 2026 11:02:18 -0800
Subject: [PATCH] 8376510

---
 src/java.desktop/share/classes/java/awt/image/Raster.java   | 5 ++++-
 .../java/awt/image/Raster/CreateRasterExceptionTest.java    | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java
index 053e7c1eec5..3312a39b693 100644
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, 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
@@ -452,6 +452,9 @@ public class Raster {
             throw new IllegalArgumentException("Dimensions (width="+w+
                                                " height="+h+") are too large");
         }
+        if (scanlineStride < 0) {
+            throw new IllegalArgumentException("Scanline stride must be >= 0");
+        }
         if (bankIndices == null) {
             throw new
                 ArrayIndexOutOfBoundsException("Bank indices array is null");
diff --git a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
index d89de44401b..13a88e8c590 100644
--- a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
+++ b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8255800 8369129
+ * @bug 8255800 8369129 8376297
  * @summary verify Raster + SampleModel creation vs spec.
  */
 
@@ -739,7 +739,7 @@ public class CreateRasterExceptionTest {
              /* @throws IllegalArgumentException if
               * {@code scanlineStride} is less than 0
               */
-            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, -3,
+            Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 10, -1000,
                                       bankIndices, bandOffsets, null);
             noException();
         } catch (IllegalArgumentException t) {