Bug #44471 - Crystal Reports generates files with short StyleRecords, which isn't...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@630164 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 285dcdea57039d71aa06595c6244bab726837d30..ae32d44f8c2717614c087de37975b768c8dfbada 100644 (file)
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -36,6 +36,7 @@
 
                <!-- Don't forget to update status.xml too! -->
         <release version="3.1-beta1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">44471 - Crystal Reports generates files with short StyleRecords, which isn't allowed in the spec. Work around this</action>
            <action dev="POI-DEVELOPERS" type="add">44450 - Support for Lookup, HLookup and VLookup functions</action>
            <action dev="POI-DEVELOPERS" type="fix">44449 - Avoid getting confused when two sheets have shared formulas for the same areas, and when the shared formula is set incorrectly</action>
            <action dev="POI-DEVELOPERS" type="fix">44366 - InputStreams passed to POIFSFileSystem are now automatically closed. A warning is generated for people who might've relied on them not being closed before, and a wrapper to restore the old behaviour is supplied</action>

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 18229083e7253e211670592c0c9a26fd6a28695b..ec41cc53375aa4aeaa9536936ac068da7b4acd3e 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,6 +33,7 @@
        <!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.1-beta1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">44471 - Crystal Reports generates files with short StyleRecords, which isn't allowed in the spec. Work around this</action>
            <action dev="POI-DEVELOPERS" type="add">44450 - Support for Lookup, HLookup and VLookup functions</action>
            <action dev="POI-DEVELOPERS" type="fix">44449 - Avoid getting confused when two sheets have shared formulas for the same areas, and when the shared formula is set incorrectly</action>
            <action dev="POI-DEVELOPERS" type="fix">44366 - InputStreams passed to POIFSFileSystem are now automatically closed. A warning is generated for people who might've relied on them not being closed before, and a wrapper to restore the old behaviour is supplied</action>

diff --git a/src/java/org/apache/poi/hssf/record/StyleRecord.java b/src/java/org/apache/poi/hssf/record/StyleRecord.java
index 9f45e3adf9c786afd5c0cc02f949ffa82adcf55b..65ca23cf34324e29773cd8e38277439971348320 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/StyleRecord.java
+++ b/src/java/org/apache/poi/hssf/record/StyleRecord.java
@@ -88,13 +88,18 @@ public class StyleRecord
         else if (getType() == STYLE_USER_DEFINED)
         {
             field_2_name_length = in.readShort();
-            field_3_string_options = in.readByte();
             
-            byte[] string = in.readRemainder();
-            if (fHighByte.isSet(field_3_string_options)) {
-                field_4_name= StringUtil.getFromUnicodeBE(string, 0, field_2_name_length);
-            }else {
-                field_4_name=StringUtil.getFromCompressedUnicode(string, 0, field_2_name_length);
+            // Some files from Crystal Reports lack
+            //  the remaining fields, which is naughty
+            if(in.remaining() > 0) {
+                   field_3_string_options = in.readByte();
+                   
+                   byte[] string = in.readRemainder();
+                   if (fHighByte.isSet(field_3_string_options)) {
+                       field_4_name= StringUtil.getFromUnicodeBE(string, 0, field_2_name_length);
+                   } else {
+                       field_4_name=StringUtil.getFromCompressedUnicode(string, 0, field_2_name_length);
+                   }
             }
         }
 

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index dc38824d39aca5c8f70e487e9de491205926bf35..04c729b3be8c40dd6ce42c357facfa125ad29fea 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -1091,17 +1091,14 @@ extends TestCase {
     }
     
     /**
-     * Date: Tue, 19 Feb 2008 05:03:47 -0800 (PST)
-     * From: Setya <jsetya@gmail.com>
-     * Subject: Exception when parsing excel file
+     * Crystal reports generates files with short 
+     *  StyleRecords, which is against the spec
      */
-    public void BROKENtest20080219() throws Exception {
+    public void test44471() throws Exception {
         FileInputStream in = new FileInputStream(new File(cwd, "OddStyleRecord.xls"));
         
-        // Blows up with an ArrayIndexOutOfBounds
+        // Used to blow up with an ArrayIndexOutOfBounds
         //  when creating a StyleRecord
-        // However, our code matches the latest Microsoft
-        //  docs, so no idea what's wrong
         HSSFWorkbook wb = new HSSFWorkbook(in);
         in.close();