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

InflaterInputStream (read): Don't return -1 unless the infate() call didn't deliver any output.

Browse source 
* java/util/zip/InflaterInputStream (read): Don't return -1 unless
	the infate() call didn't deliver any output. Throw a ZipException if
	the needsDictionary() call returns true.
	* java/io/ByteArrayInputStream (read): Remove redundant bounds checks.
	* java/io/InputStreamReader: Use the default buffer size for the
	contained BufferedInputStream.

From-SVN: r37846
This commit is contained in:
Bryce McKinlay 2000-11-29 10:06:03 +00:00 • committed by Bryce McKinlay
parent 172c38bb69
commit d02bc1fb25
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libjava/java/util/zip/InflaterInputStream.java
View file

@ -44,8 +44,6 @@ public class InflaterInputStream extends FilterInputStream
{
protected void fill () throws IOException
{
if (inf == null)
throw new IOException ("stream closed");
len = in.read(buf, 0, buf.length);
if (len != -1)
inf.setInput(buf, 0, len);
@ -85,18 +83,23 @@ public class InflaterInputStream extends FilterInputStream
return -1;
if (inf.needsInput())
fill ();
if (this.len == -1)
return -1; // Couldn't get any more data to feed to the Inflater
if (inf.needsDictionary())
return -1;
int count;
try
{
return inf.inflate(buf, off, len);
count = inf.inflate(buf, off, len);
if (count == 0)
{
if (len == -1)
return -1; // Couldn't get any more data to feed to the Inflater
if (inf.needsDictionary())
throw new ZipException ("Inflater needs Dictionary");
}
}
catch (DataFormatException dfe)
{
throw new ZipException (dfe.getMessage());
}
return count;
}
public void close () throws IOException