commit 97a40d030f92458976356058cc9746f881902221
author Keisuke Kuroyanagi <ksk@google.com> Wed Feb 19 12:35:58 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Wed Feb 19 12:35:58 2014 +0900
tree 503af4cff92bbeede3f7e4c86f8cb4c26d47f386
parent e49e007bb233ab9ac0bfa8a36fcb4a67e41496c8

Throw exception when the header cannot be read.

Bug: 13066902
Change-Id: I8fd0f361a4ca55aaab8a2bd2e11f48f92b87fc93

java/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java

diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java
index 315bd8e..71e120c 100644
--- a/java/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java
+++ b/java/src/com/android/inputmethod/latin/makedict/Ver2DictDecoder.java
@@ -173,6 +173,9 @@
     @Override
     public DictionaryHeader readHeader() throws IOException, UnsupportedFormatException {
         final DictionaryHeader header = mBinaryDictionary.getHeader();
+        if (header == null) {
+            throw new IOException("Cannot read the dictionary header.");
+        }
         if (header.mFormatOptions.mVersion != FormatSpec.VERSION2) {
             throw new UnsupportedFormatException("File header has a wrong version : "
                     + header.mFormatOptions.mVersion);