procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adler32.java: Make private variables really private

Browse source 
2000-08-20  Mark Wielaard  <mark@klomp.org>

    * java/util/zip/Adler32.java: Make private variables really private
    * java/util/zip/CRC32.java: Make private variables really private
    * java/util/zip/CheckedInputStream.java: skip() could skip to much bytes
    * java/util/zip/InflaterInputStream.java: skip() could skip to much bytes
    * java/util/zip/ZipEntry.java: setCompressedSize() didn't check input
    * java/util/zip/ZipFile.java: size() new 1.2 method
    * java/util/zip/ZipInputStream.java: Use createZipEntry not new ZipEntry.
    since 1.2 available() always returns just 1 or 0 when closed

From-SVN: r35826
This commit is contained in:
Mark Wielaard 2000-08-20 21:51:19 +00:00 • committed by Mark Wielaard
parent 3cb553b468
commit 8559f9bb2f
8 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libjava/java/util/zip/ZipInputStream.java
View file

@ -89,7 +89,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
int extraLength = readu2();
byte[] bname = new byte[filenameLength];
readFully(bname);
ZipEntry entry = new ZipEntry(new String(bname, "8859_1"));
ZipEntry entry = createZipEntry(new String(bname, "8859_1"));
if (extraLength > 0)
{
byte[] bextra = new byte[extraLength];
@ -160,6 +160,13 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
return count;
}
public int available() {
if (closed)
return 0;
else
return 1;
}
private void readFully (byte[] b) throws IOException
{
int off = 0;
@ -222,6 +229,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
public void close () throws IOException
{
current = null;
closed = true;
super.close();
}
@ -231,4 +239,6 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
private int avail;
// Number of bytes we can read from underlying stream.
private int compressed_bytes;
// Is this ZipInputStream closed? Set by the close() method.
private boolean closed = false;
}