Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8280409: JarFile::getInputStream can fail with NPE accessing ze.getName() #7348

Closed
wants to merge 10 commits into from
+1,104 −33
Closed

8280409: JarFile::getInputStream can fail with NPE accessing ze.getName() #7348

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4488fd
Address Zip/JarFile::getInputStream Exception handling
LanceAndersen Feb 4, 2022
b50ebf0
Update copyright year
LanceAndersen Feb 4, 2022
6c75384
Reduce Exception checking to JarFile::verifiableEntry
LanceAndersen Feb 7, 2022
dbd56d8
Address formatting and message feedback
LanceAndersen Feb 8, 2022
32f6c28
Return a null InputStream when the ZipEntry is not found in the Jar
LanceAndersen Feb 10, 2022
d5cf8db
Return null when ZipEntry::getName is null
LanceAndersen Feb 17, 2022
490c986
Add additional comments describing how the jars are created
LanceAndersen Feb 18, 2022
818c285
remove trailing space
LanceAndersen Feb 18, 2022
839d99f
remove extra '}'
LanceAndersen Feb 18, 2022
e540a3a
Modified and clarified test comments
LanceAndersen Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion test/jdk/java/util/zip/ZipFile/GetInputStreamNPETest.java
View file
Original file line number Diff line number Diff line change
@@ -706,7 +706,7 @@ public class GetInputStreamNPETest {
(byte) 0x0, (byte) 0x0, (byte) 0xf1, (byte) 0x6, (byte) 0x0,
(byte) 0x0, (byte) 0x6a, (byte) 0x61, (byte) 0x76, (byte) 0x61,
(byte) 0x78, (byte) 0x2f, (byte) 0x69, (byte) 0x6e, (byte) 0x6a,
// We will modify 0x53, "S" within the CEN filename entry
// We will modify 0x53, "S", within the CEN filename entry
(byte) 0x65, (byte) 0x63, (byte) 0x74, (byte) 0x2f, (byte) 0x53,
(byte) 0x69, (byte) 0x6e, (byte) 0x67, (byte) 0x6c, (byte) 0x65,
(byte) 0x74, (byte) 0x6f, (byte) 0x6e, (byte) 0x2e, (byte) 0x63,
@@ -751,7 +751,35 @@ public Object[][] inValidJars() {
/**
* Create Jar files used by the tests.
*
* The signed jar was created from the jar {@code Valid-EntryName.jar} via:
* <pre>
* {@code
* keytool -genkey -keyalg RSA -alias myFirstKey -keystore myKeystore -storepass changeit -keypass changeit}
* jarsigner -keystore myKeystore -verbose Valid-EntryName.jar -signedjar signed.jar myFirstKey}
* }
* </pre>
*
* The {@code Valid-EntryName.jar} and {@code Signed-Valid-EntryName.jar}
* that are written to disk at the start of the test run within
* the {@code setup} method were converted to a {@code ByteArray} using the
* utility method {@code createByteArray} using code similar to:
*
* <pre>
* {@code
* var jar = Files.readAllBytes(VALID_ENTRY_NAME_JAR);
* var validEntryName = createByteArray(fooJar, "VALID_ENTRY_NAME");
* var signedJar = Files.readAllBytes(SIGNED_VALID_ENTRY_NAME_JAR);
* var signedValidEntryName = createByteArray(fooJar, "SIGNED_VALID_ENTRY_NAME");
* }
* </pre>
*
* The jar files {@code Invalid-EntryName.jar} and
* {@code Signed-Invalid-EntryName.jar} are created by modifying
* the CEN filename entry changing the value from
* {@code 0x53}, "S", to the value {@code 0x13}
*
* @throws IOException If an error occurs
*
*/
@BeforeTest
public static void setup() throws IOException {