diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-04-11 22:18:36 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 22:18:36 -0700 |
| commit | 47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b (patch) | |
| tree | 5cd0e5bb2c3426cf975e33a4df080f29edb48a67 /native/jni/src | |
| parent | cfdc91b99abbb985a7e9207020b95b1df807d567 (diff) | |
| parent | 4fffa27d3f620135f61b7dfb447ab3bf2b2367f5 (diff) | |
| download | latinime-47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b.tar.gz latinime-47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b.tar.xz latinime-47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b.zip | |
am 4fffa27d: Fix a native crash in AOSP LatinIME
* commit '4fffa27d3f620135f61b7dfb447ab3bf2b2367f5':
Fix a native crash in AOSP LatinIME
Diffstat (limited to 'native/jni/src')
| -rw-r--r-- | native/jni/src/suggest/core/suggest.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/src/suggest/core/suggest.h b/native/jni/src/suggest/core/suggest.h index 6c09b9467..9f609c50c 100644 --- a/native/jni/src/suggest/core/suggest.h +++ b/native/jni/src/suggest/core/suggest.h @@ -42,8 +42,9 @@ class Weighting; 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, |