Yegor's patch from bug #41242

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

1 files changed, 12 insertions, 0 deletions

diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java
index 34ccef7551..0dc48836fb 100644
--- a/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java
@@ -81,13 +81,25 @@ public class ObjRecord
         subrecords = new ArrayList();
         //Check if this can be continued, if so then the
         //following wont work properly
+        int subSize = 0;
         byte[] subRecordData = in.readRemainder();
         RecordInputStream subRecStream = new RecordInputStream(new ByteArrayInputStream(subRecordData));
         while(subRecStream.hasNextRecord()) {
           subRecStream.nextRecord();
           Record subRecord = SubRecord.createSubRecord(subRecStream);
+          subSize += subRecord.getRecordSize();
           subrecords.add(subRecord);
         }
+
+        /**
+         * Check if the RecordInputStream skipped EndSubRecord,
+         * if it did then append it explicitly.
+         * See Bug 41242 for details.
+         */
+        if (subRecordData.length - subSize == 4){
+            subrecords.add(new EndSubRecord());
+        }
+
         /* JMH the size present/not present in the code below
            needs to be considered in the RecordInputStream??
         int pos = offset;