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

Better handle the case of there not being enough data in the record to form

Browse Source 
a final CharacterStyle


git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353762 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2005-08-07 15:26:26 +00:00
parent 4e01b6989f
commit 3824c8b638
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
View File

@ -92,7 +92,11 @@ public class StyleTextPropAtom extends RecordAtom
// While we have the data, grab the character styles // While we have the data, grab the character styles
Vector cp = new Vector(); Vector cp = new Vector();
int cpos = 0; 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; CharacterStyle cs;
short clen = LittleEndian.getShort(source,start+8+10+cpos); short clen = LittleEndian.getShort(source,start+8+10+cpos);
@ -108,14 +112,25 @@ public class StyleTextPropAtom extends RecordAtom
cpos += 4; cpos += 4;
cs = new CharacterStyle(clen,s1,s2,(short)0); cs = new CharacterStyle(clen,s1,s2,(short)0);
} }
// Only add if it won't push us past the end of the record
if(cpos <= (len-8-10)) {
cp.add(cs); 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()]; charStyles = new CharacterStyle[cp.size()];
for(int i=0; i<charStyles.length; i++) { for(int i=0; i<charStyles.length; i++) {
charStyles[i] = (CharacterStyle)cp.get(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]; reserved = new byte[len-8-10-cpos];
System.arraycopy(source,start+8+10+cpos,reserved,0,reserved.length); System.arraycopy(source,start+8+10+cpos,reserved,0,reserved.length);
} }