diff options
| author | Jeroen Frijters <jeroen@sumatra.nl> | 2011-03-15 06:19:37 +0000 |
|---|---|---|
| committer | Jeroen Frijters <jeroen@sumatra.nl> | 2011-03-15 06:19:37 +0000 |
| commit | 58623414190c50acd270b42b5b61a60707842b02 (patch) | |
| tree | bbbcfd6428cb6456ef9ad1e155493f39171c558b | |
| parent | 28789fb0abb54b1d4451516ec459edd71f37a72b (diff) | |
| download | classpath-58623414190c50acd270b42b5b61a60707842b02.tar.gz | |
Fix for PR 48131.
Handle empty tree.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/util/zip/InflaterHuffmanTree.java | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2011-03-15 Jeroen Frijters <jeroen@frijters.net> + + PR classpath/48131 + * java/util/zip/InflaterHuffmanTree.java: + (buildTree): Handle empty tree. + 2011-03-14 Pekka Enberg <penberg@kernel.org> * javax/swing/text/html/StyleSheet.java: diff --git a/java/util/zip/InflaterHuffmanTree.java b/java/util/zip/InflaterHuffmanTree.java index f6b5816ff..1a152d2b2 100644 --- a/java/util/zip/InflaterHuffmanTree.java +++ b/java/util/zip/InflaterHuffmanTree.java @@ -112,7 +112,7 @@ class InflaterHuffmanTree treeSize += (end - start) >> (16 - bits); } } - if (code != 65536 && max != 1) + if (code != 65536 && max > 1) throw new DataFormatException("incomplete dynamic bit lengths tree"); /* Now create and fill the extra tables from longest to shortest |