aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2013-10-04 12:30:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 12:30:48 -0700
commit06ba3ef19fba91dcb9071cadc4b4bd4d0b454366 (patch)
tree4a8d35aa01fed1590f522678d1c3b8dde1d48dfb /native/jni/src
parent5ce9603784423f6dfa4f0654b0b104591f7ac1ae (diff)
parent551a1c246ff348353a57ea3be13aa419457923f5 (diff)
downloadlatinime-06ba3ef19fba91dcb9071cadc4b4bd4d0b454366.tar.gz
latinime-06ba3ef19fba91dcb9071cadc4b4bd4d0b454366.tar.xz
latinime-06ba3ef19fba91dcb9071cadc4b4bd4d0b454366.zip
am 551a1c24: reset to klp-dev branch to fix merging problem.
* commit '551a1c246ff348353a57ea3be13aa419457923f5':
Diffstat (limited to 'native/jni/src')
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp
index 2694ce8d5..5ded8f6a1 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp
@@ -139,6 +139,9 @@ const char *const HeaderReadWriteUtils::REQUIRES_FRENCH_LIGATURE_PROCESSING_KEY
int *const writingPos) {
for (AttributeMap::const_iterator it = headerAttributes->begin();
it != headerAttributes->end(); ++it) {
+ if (it->first.empty() || it->second.empty()) {
+ continue;
+ }
// Write a key.
if (!buffer->writeCodePointsAndAdvancePosition(&(it->first.at(0)), it->first.size(),
true /* writesTerminator */, writingPos)) {