From: Dominik Stadler Date: Mon, 20 Apr 2015 18:16:30 +0000 (+0000) Subject: Fix possible ArrayIndexOutOfBoundsException seen with some word documents X-Git-Tag: REL_3_12_FINAL~51 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=710b10eb1fd51c98fc92ec5da3d1dad3702a2479;p=poi.git Fix possible ArrayIndexOutOfBoundsException seen with some word documents git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1674954 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java index 0c68acef4a..29875d67d7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java @@ -850,7 +850,7 @@ public abstract class AbstractWordConverter String[] values = cr.getDropDownListValues(); Integer defIndex = cr.getDropDownListDefaultItemIndex(); - if ( values != null ) + if ( values != null && values.length > 0 ) { processDropDownList( currentBlock, cr, values, defIndex == null ? -1 : defIndex.intValue() ); diff --git a/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc b/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc new file mode 100644 index 0000000000..82d00415ec Binary files /dev/null and b/test-data/document/au.edu.utas.www___data_assets_word_doc_0003_154335_International-Travel-Approval-Request-Form.doc differ