moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix for Softmaker Office files, which set encryption settings invalidly

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1735298 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-03-16 21:05:37 +00:00
parent 81e49eff0f
commit 52fe2e4571
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
View File

@ -85,7 +85,12 @@ public class HSLFSlideShowEncrypted {
PersistPtrHolder ptr = (PersistPtrHolder)r; PersistPtrHolder ptr = (PersistPtrHolder)r;
Integer encOffset = ptr.getSlideLocationsLookup().get(userEditAtomWithEncryption.getEncryptSessionPersistIdRef()); 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); r = recordMap.get(encOffset);
if (r == null) { if (r == null) {