From 5b42301a451bd4c4598b6f85bab7b1e53b72aef4 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 13 Feb 2015 19:14:14 +0000 Subject: Bug 57456: Fix reading XLS with empty SSTRecord where Excel puts some random number in unique-strings-count-field git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1659650 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/hssf/record/SSTRecord.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/java') diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/src/java/org/apache/poi/hssf/record/SSTRecord.java index aadd58619b..abbf909681 100644 --- a/src/java/org/apache/poi/hssf/record/SSTRecord.java +++ b/src/java/org/apache/poi/hssf/record/SSTRecord.java @@ -243,7 +243,14 @@ public final class SSTRecord extends ContinuableRecord { field_1_num_strings = in.readInt(); field_2_num_unique_strings = in.readInt(); field_3_strings = new IntMapper(); + deserializer = new SSTDeserializer(field_3_strings); + // Bug 57456: some Excel Sheets send 0 as field=1, but have some random number in field_2, + // we should not try to read the strings in this case. + if(field_1_num_strings == 0) { + field_2_num_unique_strings = 0; + return; + } deserializer.manufactureStrings( field_2_num_unique_strings, in ); } -- cgit v1.2.3