8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4

prrace · prrace · commit 1a7b70a8be0a · 2022-02-14T23:31:13.000Z
Reviewed-by: serb
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java
@@ -1297,8 +1297,9 @@ public void run() {
                     }
                 }
                 while (doIO && thread == curThread) {
-                    if (newFramePosition >= 0) {
-                        clipBytePosition = newFramePosition * frameSize;
+                    int npf = newFramePosition; // copy into local variable
+                    if (npf >= 0) {
+                        clipBytePosition = npf * frameSize;
                         newFramePosition = -1;
                     }
                     int endFrame = getFrameLength() - 1;
diff --git a/test/jdk/javax/sound/sampled/Clip/SetPositionHang.java b/test/jdk/javax/sound/sampled/Clip/SetPositionHang.java
@@ -28,7 +28,7 @@
 
 /**
  * @test
- * @bug 8266421
+ * @bug 8266421 8269091
  * @summary Tests that Clip.setFramePosition/setMicrosecondPosition do not hang.
  */
 public final class SetPositionHang implements Runnable {

Original file line number	Diff line number	Diff line change
`@@ -1297,8 +1297,9 @@ public void run() {`
`1297`	`1297`	`}`
`1298`	`1298`	`}`
`1299`	`1299`	`while (doIO && thread == curThread) {`
`1300`		`- if (newFramePosition >= 0) {`
`1301`		`- clipBytePosition = newFramePosition * frameSize;`
	`1300`	`+ int npf = newFramePosition; // copy into local variable`
	`1301`	`+ if (npf >= 0) {`
	`1302`	`+ clipBytePosition = npf * frameSize;`
`1302`	`1303`	`newFramePosition = -1;`
`1303`	`1304`	`}`
`1304`	`1305`	`int endFrame = getFrameLength() - 1;`