aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-01-06 17:56:49 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2014-01-06 17:56:49 +0900
commit8214a8c2cf29ef28ccf515b9df1390299fd4cbdd (patch)
treedb294c73e9cea29adf148292abbb23b9db1839a5 /java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
parent3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42 (diff)
downloadlatinime-8214a8c2cf29ef28ccf515b9df1390299fd4cbdd.tar.gz
latinime-8214a8c2cf29ef28ccf515b9df1390299fd4cbdd.tar.xz
latinime-8214a8c2cf29ef28ccf515b9df1390299fd4cbdd.zip
Fix possible NPE.
Bug: 11933670 Change-Id: Ib0ce853e691bdadffb73874ea9f188cfbec8bc93
Diffstat (limited to 'java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
index 07ba777c7..0dc50d14e 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
@@ -309,6 +309,7 @@ public final class BinaryDictIOUtils {
* @param file The file to read.
* @param offset The offset in the file where to start reading the data.
* @param length The length of the data file.
+ * @return the header of the specified dictionary file.
*/
private static FileHeader getDictionaryFileHeader(
final File file, final long offset, final long length)
@@ -330,6 +331,9 @@ public final class BinaryDictIOUtils {
}
}
);
+ if (dictDecoder == null) {
+ return null;
+ }
return dictDecoder.readHeader();
}