From 80249d97801a37db74a91355282a55d3b5e2a8b4 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Fri, 18 May 2007 13:17:41 +0000 Subject: [PATCH] If the apparent location of the current user atom is past the end of the data, then the file's clearly corrupt, so throw a better exception git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@539453 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/hslf/EncryptedSlideShow.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java index 67d6dc9f7..2b92b848d 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java @@ -22,6 +22,7 @@ package org.apache.poi.hslf; import java.io.FileNotFoundException; +import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; import org.apache.poi.hslf.record.CurrentUserAtom; import org.apache.poi.hslf.record.DocumentEncryptionAtom; import org.apache.poi.hslf.record.PersistPtrHolder; @@ -84,6 +85,11 @@ public class EncryptedSlideShow CurrentUserAtom cua = hss.getCurrentUserAtom(); if(cua.getCurrentEditOffset() != 0) { + // Check it's not past the end of the file + if(cua.getCurrentEditOffset() > hss.getUnderlyingBytes().length) { + throw new CorruptPowerPointFileException("The CurrentUserAtom claims that the offset of last edit details are past the end of the file"); + } + // Grab the details of the UserEditAtom there Record r = Record.buildRecordAtOffset( hss.getUnderlyingBytes(),