commit 676c97eb2da392abced7d27fffc4fb58abeafbbc
author Jean Chalard <jchalard@google.com> Fri Apr 12 10:59:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 12 10:59:47 2013 +0000
tree a1589c11793925a4c08d757982e6927e3262a932
parent 2daea19709cd6c9d844d9ad77076256e2f3967ad
parent d89ed476169f3d03aa8d080c40098f4724c093ad

Merge "Remove voodoo magic."

native/jni/src/suggest/core/suggest.h

diff --git a/native/jni/src/suggest/core/suggest.h b/native/jni/src/suggest/core/suggest.h
index 136c4e5..becd6c1 100644
--- a/native/jni/src/suggest/core/suggest.h
+++ b/native/jni/src/suggest/core/suggest.h
@@ -42,8 +42,9 @@
 class Suggest : public SuggestInterface {
  public:
     AK_FORCE_INLINE Suggest(const SuggestPolicy *const suggestPolicy)
-            : TRAVERSAL(suggestPolicy->getTraversal()),
-              SCORING(suggestPolicy->getScoring()), WEIGHTING(suggestPolicy->getWeighting()) {}
+            : TRAVERSAL(suggestPolicy ? suggestPolicy->getTraversal() : 0),
+              SCORING(suggestPolicy ? suggestPolicy->getScoring() : 0),
+              WEIGHTING(suggestPolicy ? suggestPolicy->getWeighting() : 0) {}
     AK_FORCE_INLINE virtual ~Suggest() {}
     int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs, int *inputYs,
             int *times, int *pointerIds, int *inputCodePoints, int inputSize, int commitPoint,