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

Demote the HPSF CodePageString null check from an exception to a Warning, as we seem to be hitting it incorrectly (see bug #52258 for details)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1207477 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2011-11-28 17:38:29 +00:00
parent b7f3cd3458
commit 991fd65ee8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/org/apache/poi/hpsf/CodePageString.java
View File

@ -158,10 +158,16 @@ class CodePageString
offset += LittleEndian.INT_SIZE; offset += LittleEndian.INT_SIZE;
_value = LittleEndian.getByteArray( data, offset, size ); _value = LittleEndian.getByteArray( data, offset, size );
if ( _value[size - 1] != 0 ) if ( _value[size - 1] != 0 ) {
throw new IllegalPropertySetDataException( // TODO Some files, such as TestVisioWithCodepage.vsd, are currently
"CodePageString started at offset #" + offset // triggering this for values that don't look like codepages
+ " is not NULL-terminated" ); // See Bug #52258 for details
logger.log(POILogger.WARN, "CodePageString started at offset #" + offset
+ " is not NULL-terminated" );
// throw new IllegalPropertySetDataException(
// "CodePageString started at offset #" + offset
// + " is not NULL-terminated" );
}
} }
CodePageString( String string, int codepage ) CodePageString( String string, int codepage )