From: Andreas Beeker <kiwiwings@apache.org>
Date: Wed, 16 Mar 2016 21:05:37 +0000 (+0000)
Subject: Fix for Softmaker Office files, which set encryption settings invalidly
X-Git-Tag: REL_3_15_BETA2~436
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e5c991855a12b1bd536571c9f6bf2d7f474d891;p=poi.git

Fix for Softmaker Office files, which set encryption settings invalidly

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
index 6f0e9e4c49..3d77d92d2a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
@@ -85,7 +85,12 @@ public class HSLFSlideShowEncrypted {
         PersistPtrHolder ptr = (PersistPtrHolder)r;
         
         Integer encOffset = ptr.getSlideLocationsLookup().get(userEditAtomWithEncryption.getEncryptSessionPersistIdRef());
-        assert(encOffset != null);
+        if (encOffset == null) {
+            // encryption info doesn't exist anymore
+        	// SoftMaker Freeoffice produces such invalid files - check for "SMNativeObjData" ole stream
+            dea = null;
+            return;
+        }
         
         r = recordMap.get(encOffset);
         if (r == null) {