From 58623414190c50acd270b42b5b61a60707842b02 Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Tue, 15 Mar 2011 06:19:37 +0000 Subject: Fix for PR 48131. Handle empty tree. --- ChangeLog | 6 ++++++ java/util/zip/InflaterHuffmanTree.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc9a41a08..18416ce70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-15 Jeroen Frijters + + PR classpath/48131 + * java/util/zip/InflaterHuffmanTree.java: + (buildTree): Handle empty tree. + 2011-03-14 Pekka Enberg * 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 -- cgit v1.2.1