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

temporary(?) workaround for Bug 49933 - Word 6/95 documents with sections cause ArrayIndexOutOfBoundsException

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-07-09 15:33:41 +00:00
parent 530a209d01
commit f23c8a021a
2 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
View File

@ -19,24 +19,33 @@ package org.apache.poi.hwpf.model;
import org.apache.poi.hwpf.sprm.SectionSprmCompressor; import org.apache.poi.hwpf.sprm.SectionSprmCompressor;
import org.apache.poi.hwpf.sprm.SectionSprmUncompressor; import org.apache.poi.hwpf.sprm.SectionSprmUncompressor;
import org.apache.poi.hwpf.sprm.SprmBuffer;
import org.apache.poi.hwpf.usermodel.SectionProperties; import org.apache.poi.hwpf.usermodel.SectionProperties;
/**
*/
public final class SEPX extends BytePropertyNode<SEPX> public final class SEPX extends BytePropertyNode<SEPX>
{ {
SectionProperties sectionProperties;
SectionDescriptor _sed; SectionDescriptor _sed;
public SEPX(SectionDescriptor sed, int start, int end, CharIndexTranslator translator, byte[] grpprl) public SEPX( SectionDescriptor sed, int start, int end,
CharIndexTranslator translator, byte[] grpprl )
{ {
super(start, end, translator, SectionSprmUncompressor.uncompressSEP(grpprl, 0)); super( start, end, translator, new SprmBuffer( grpprl ) );
_sed = sed; _sed = sed;
} }
public byte[] getGrpprl() public byte[] getGrpprl()
{ {
return SectionSprmCompressor.compressSectionProperty((SectionProperties)_buf); if ( sectionProperties != null )
{
byte[] grpprl = SectionSprmCompressor
.compressSectionProperty( sectionProperties );
_buf = new SprmBuffer( grpprl );
}
return ( (SprmBuffer) _buf ).toByteArray();
} }
public SectionDescriptor getSectionDescriptor() public SectionDescriptor getSectionDescriptor()
@ -46,15 +55,20 @@ public final class SEPX extends BytePropertyNode<SEPX>
public SectionProperties getSectionProperties() public SectionProperties getSectionProperties()
{ {
return (SectionProperties)_buf; if ( sectionProperties == null )
{
sectionProperties = SectionSprmUncompressor.uncompressSEP(
( (SprmBuffer) _buf ).toByteArray(), 0 );
}
return sectionProperties;
} }
public boolean equals(Object o) public boolean equals( Object o )
{ {
SEPX sepx = (SEPX)o; SEPX sepx = (SEPX) o;
if (super.equals(o)) if ( super.equals( o ) )
{ {
return sepx._sed.equals(_sed); return sepx._sed.equals( _sed );
} }
return false; return false;
} }

5
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
View File

@ -793,6 +793,11 @@ public final class TestProblems extends HWPFTestCase {
} }
} }
public void test49933()
{
HWPFTestDataSamples.openOldSampleFile( "Bug49933.doc" );
}
/** /**
* Bug 50936 - HWPF fails to read a file * Bug 50936 - HWPF fails to read a file
*/ */