Skip to content

Commit d7b37d6

Browse files
author
duke
committed
Automatic merge of jdk:master into master
2 parents 7ead09e + 9bb8223 commit d7b37d6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/java.base/share/classes/java/util/jar/JarFile.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,14 +739,19 @@ private void initializeVerifier() {
739739
List<String> names = JUZFA.getManifestAndSignatureRelatedFiles(this);
740740
for (String name : names) {
741741
JarEntry e = getJarEntry(name);
742+
byte[] b;
742743
if (e == null) {
743744
throw new JarException("corrupted jar file");
744745
}
745746
if (mev == null) {
746747
mev = new ManifestEntryVerifier
747748
(getManifestFromReference());
748749
}
749-
byte[] b = getBytes(e);
750+
if (name.equals(MANIFEST_NAME)) {
751+
b = jv.manifestRawBytes;
752+
} else {
753+
b = getBytes(e);
754+
}
750755
if (b != null && b.length > 0) {
751756
jv.beginEntry(e, mev);
752757
jv.update(b.length, b, 0, b.length, mev);

0 commit comments

Comments
 (0)