commit 435cccb2c5869099be0fae07a103219410e3d2f1
author Satoshi Kataoka <satok@google.com> Tue Mar 26 12:58:44 2013 +0900
committer Satoshi Kataoka <satok@google.com> Tue Mar 26 13:02:23 2013 +0900
tree 6b0970b63e092ed83ba7edd10ad2207c617c9583
parent 0b3271010fe6e438d57a5d4504e021e001bb9f5e

Fix Possible NPE

Bug: 8448448
Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c

java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java

diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
index 62f2a97..1093155 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
@@ -207,7 +207,12 @@
             final ArrayList<PendingAttribute> attrList = bigrams.get(entry.getKey());
             if (attrList != null) {
                 for (final PendingAttribute attr : attrList) {
-                    to.setBigram(word1, unigrams.get(attr.mAddress),
+                    final String word2 = unigrams.get(attr.mAddress);
+                    if (word1 == null || word2 == null) {
+                        Log.e(TAG, "Invalid bigram pair detected: " + word1 + ", " + word2);
+                        continue;
+                    }
+                    to.setBigram(word1, word2,
                             BinaryDictInputOutput.reconstructBigramFrequency(unigramFrequency,
                                     attr.mFrequency));
                 }