Commitff843fa

committed

8240333: jmod incorrectly updates .jar and .jmod files during hashing

Reviewed-by: martin, alanb, lancea

1 parent128f083 commitff843faCopy full SHA for ff843fa

File tree

+22

-3

lines changed

src/jdk.jlink/share/classes/jdk/tools/jmod
- JmodOutputStream.java
- JmodTask.java

+22

-3

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2016,2020,Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -92,7 +92,20 @@ public void writeEntry(byte[] bytes, Section section, String path)`
`92`	`92`	`* Writes the given entry to the given input stream.`
`93`	`93`	`*/`
`94`	`94`	`publicvoidwriteEntry(InputStreamin,Entrye)throwsIOException {`
`95`		`-zos.putNextEntry(e.zipEntry());`
	`95`	`+ZipEntrye1 =e.zipEntry();`
	`96`	`+// Only preserve attributes which won't change by`
	`97`	`+// inflating and deflating the entry. See:`
	`98`	`+// sun.tools.jar.Main.update()`
	`99`	`+ZipEntrye2 =newZipEntry(e1.getName());`
	`100`	`+e2.setMethod(e1.getMethod());`
	`101`	`+e2.setTime(e1.getTime());`
	`102`	`+e2.setComment(e1.getComment());`
	`103`	`+e2.setExtra(e1.getExtra());`
	`104`	`+if (e1.getMethod() ==ZipEntry.STORED) {`
	`105`	`+e2.setSize(e1.getSize());`
	`106`	`+e2.setCrc(e1.getCrc());`
	`107`	`+ }`
	`108`	`+zos.putNextEntry(e2);`
`96`	`109`	`zos.write(in.readAllBytes());`
`97`	`110`	`zos.closeEntry();`
`98`	`111`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015,2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2015,2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -987,6 +987,12 @@ private void updateModularJar(Path target, Path tempTarget,`
`987`	`987`	`recordHashes(in,jos,moduleHashes);`
`988`	`988`	`jos.closeEntry();`
`989`	`989`	`}else {`
	`990`	`+// Setting "compressedSize" to "-1" prevents an error`
	`991`	`+// in ZipOutputStream.closeEntry() if the newly`
	`992`	`+// deflated entry will have another size than the`
	`993`	`+// original compressed entry. See:`
	`994`	`+// ZipOutputStream.putNextEntry()/closeEntry()`
	`995`	`+e.setCompressedSize(-1);`
`990`	`996`	`jos.putNextEntry(e);`
`991`	`997`	`jos.write(in.readAllBytes());`
`992`	`998`	`jos.closeEntry();`

Comments

(0)