OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/24461 (array access in either GZIPInputStream, Inflater, natInflate.cc, or zlib) 

PR libgcj/24461:
	* java/util/zip/InflaterInputStream.java (fill): Throw exception
	if stream is truncated.

From-SVN: r111870
This commit is contained in:
Tom Tromey 2006-03-09 20:21:58 +00:00 committed by Tom Tromey
parent e59a1e40f3
commit 1fea4e6c43
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-09 Tom Tromey <tromey@redhat.com>
PR libgcj/24461:
* java/util/zip/InflaterInputStream.java (fill): Throw exception
if stream is truncated.
2006-03-09 Tom Tromey <tromey@redhat.com>
* win32.cc (_Jv_platform_nanotime): New function.

8
libjava/java/util/zip/InflaterInputStream.java
View File

@ -1,5 +1,5 @@
/* InflaterInputStream.java - Input stream filter for decompressing
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -153,8 +153,10 @@ public class InflaterInputStream extends FilterInputStream
len = in.read(buf, 0, buf.length);
if (len >= 0)
inf.setInput(buf, 0, len);
if (len < 0)
throw new ZipException("Deflated stream ends early.");
inf.setInput(buf, 0, len);
}
/**