From 1dfad6010653abf86959da8b361d8470d0552171 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Sun, 7 Aug 2005 15:26:26 +0000
Subject: [PATCH] Better handle the case of there not being enough data in the
 record to form a final CharacterStyle

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353762 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hslf/record/StyleTextPropAtom.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
index 472030b07a..46578a45d5 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
@@ -92,7 +92,11 @@ public class StyleTextPropAtom extends RecordAtom
 		// While we have the data, grab the character styles
 		Vector cp = new Vector();
 		int cpos = 0;
-		while(cpos <= len-8-10-8) { // Min size is 8, then 8+10 in
+		int oldCpos = 0;
+		boolean overshot = false;
+
+		// Min size is 8, everything starts 8+10 in to the record
+		while((cpos <= len-8-10-8) && !overshot) { 
 			CharacterStyle cs;
 			
 			short clen = LittleEndian.getShort(source,start+8+10+cpos);
@@ -108,14 +112,25 @@ public class StyleTextPropAtom extends RecordAtom
 				cpos += 4;
 				cs = new CharacterStyle(clen,s1,s2,(short)0);
 			}
-			cp.add(cs);
+
+			// Only add if it won't push us past the end of the record
+			if(cpos <= (len-8-10)) {
+				cp.add(cs);
+				oldCpos = cpos;
+			} else {
+				// Long CharacterStyle, but only enough data for a short one!
+				// Rewind back to the end of the last CharacterStyle
+				cpos = oldCpos;
+				overshot = true;
+			}
 		}
 		charStyles = new CharacterStyle[cp.size()];
 		for(int i=0; i<charStyles.length; i++) {
 			charStyles[i] = (CharacterStyle)cp.get(i);
 		}
 
-		// Chuck anything that doesn't fit somewhere for safe keeping
+		// Chuck anything that doesn't make a complete CharacterStyle 
+		// somewhere for safe keeping
 		reserved = new byte[len-8-10-cpos];
 		System.arraycopy(source,start+8+10+cpos,reserved,0,reserved.length);
 	}
-- 
2.39.5