commit 3cc0a1d2e0c5f82af561af8b51dfcaff9b2070af
author Keisuke Kuroyanagi <ksk@google.com> Thu Oct 03 17:33:34 2013 +0900
committer The Android Automerger <android-build@android.com> Thu Oct 03 13:40:11 2013 -0700
tree 0a79e2abf66b323697f6e0161a782cd10f8a6a7e
parent e26b750805906f18d6ea52b602680bc3ff173ea9

Fix: Native crash when an empty attribute is written. DO NOT MERGE

Bug: 10964805
Change-Id: I862a6b920a7a09eac4e012bfe75f087b2d7b4fe6

native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp

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 2694ce8..5ded8f6 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 @@
         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)) {