aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2013-10-03 17:30:54 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2013-10-03 17:30:54 +0900
commit9cb1e78a44f4136d05df8368816e12725cbf5861 (patch)
tree5e4f831dc78df651eb5518d2556a14c2a278a446 /native/jni/src
parent3d92954120a5bfd0a34d81a6b78c58ff07040b01 (diff)
downloadlatinime-9cb1e78a44f4136d05df8368816e12725cbf5861.tar.gz
latinime-9cb1e78a44f4136d05df8368816e12725cbf5861.tar.xz
latinime-9cb1e78a44f4136d05df8368816e12725cbf5861.zip
Fix: Native crash when an empty attribute is written.
Bug: 10964805 Change-Id: Ia3cd891d20aee2226092f0f646d8f280901786fc
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)) {