8293742: Better Banking of Sounds

Reviewed-by: mbalao, andrew
Backport-of: f1de79f38fcff10ccaf232f79df0a94e84751ff7

Author: Alexei Voitylov

jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, 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
@@ -32,6 +32,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Objects;
 import javax.sound.midi.InvalidMidiDataException;
 import javax.sound.midi.Soundbank;
 import javax.sound.midi.spi.SoundbankReader;
@@ -45,6 +46,13 @@
  */
 public final class JARSoundbankReader extends SoundbankReader {
 
+    /*
+     * Name of the system property that enables the Jar soundbank loading
+     * true if jar sound bank is allowed to be loaded
+     * default is false
+     */
+    private final static String JAR_SOUNDBANK_ENABLED = "jdk.sound.jarsoundbank";
+
     private static boolean isZIP(URL url) {
         boolean ok = false;
         try {
@@ -68,8 +76,10 @@ private static boolean isZIP(URL url) {
 
     public Soundbank getSoundbank(URL url)
             throws InvalidMidiDataException, IOException {
-        if (!isZIP(url))
+        Objects.requireNonNull(url);
+        if (!Boolean.getBoolean(JAR_SOUNDBANK_ENABLED) || !isZIP(url))
             return null;
+
         ArrayList<Soundbank> soundbanks = new ArrayList<Soundbank>();
         URLClassLoader ucl = URLClassLoader.newInstance(new URL[]{url});
         InputStream stream = ucl.getResourceAsStream(
@@ -117,6 +127,7 @@ public Soundbank getSoundbank(InputStream stream)
 
     public Soundbank getSoundbank(File file)
             throws InvalidMidiDataException, IOException {
+        Objects.requireNonNull(file);
         return getSoundbank(file.toURI().toURL());
     }
 }