1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8272026: Verify Jar Verification

Browse Source 
Reviewed-by: rhalade, valeriep, mschoene
This commit is contained in:
Weijun Wang 2021-09-20 15:12:15 +00:00 committed by Henry Jen
parent cb7482d5bd
commit 4d3663a6d0
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java.base/share/classes/java/util/jar/Attributes.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,7 @@
package java.util.jar; package java.util.jar;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
@ -366,7 +367,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
int read(Manifest.FastInputStream is, byte[] lbuf, String filename, int lineNumber) throws IOException { int read(Manifest.FastInputStream is, byte[] lbuf, String filename, int lineNumber) throws IOException {
String name = null, value; String name = null, value;
byte[] lastline = null; ByteArrayOutputStream fullLine = new ByteArrayOutputStream();
int len; int len;
while ((len = is.readLine(lbuf)) != -1) { while ((len = is.readLine(lbuf)) != -1) {
@ -392,15 +393,12 @@ public class Attributes implements Map<Object,Object>, Cloneable {
+ Manifest.getErrorPosition(filename, lineNumber) + ")"); + Manifest.getErrorPosition(filename, lineNumber) + ")");
} }
lineContinued = true; lineContinued = true;
byte[] buf = new byte[lastline.length + len - 1]; fullLine.write(lbuf, 1, len - 1);
System.arraycopy(lastline, 0, buf, 0, lastline.length);
System.arraycopy(lbuf, 1, buf, lastline.length, len - 1);
if (is.peek() == ' ') { if (is.peek() == ' ') {
lastline = buf;
continue; continue;
} }
value = new String(buf, 0, buf.length, UTF_8.INSTANCE); value = fullLine.toString(UTF_8.INSTANCE);
lastline = null; fullLine.reset();
} else { } else {
while (lbuf[i++] != ':') { while (lbuf[i++] != ':') {
if (i >= len) { if (i >= len) {
@ -414,8 +412,8 @@ public class Attributes implements Map<Object,Object>, Cloneable {
} }
name = new String(lbuf, 0, i - 2, UTF_8.INSTANCE); name = new String(lbuf, 0, i - 2, UTF_8.INSTANCE);
if (is.peek() == ' ') { if (is.peek() == ' ') {
lastline = new byte[len - i]; fullLine.reset();
System.arraycopy(lbuf, i, lastline, 0, len - i); fullLine.write(lbuf, i, len - i);
continue; continue;
} }
value = new String(lbuf, i, len - i, UTF_8.INSTANCE); value = new String(lbuf, i, len - i, UTF_8.INSTANCE);