am 7e6e9701: Merge "Fix: Native crash when an empty attribute is written."

* commit '7e6e97014d7d031f233267220a627b3dfdfd26dc':
  Fix: Native crash when an empty attribute is written.
This commit is contained in:
Keisuke Kuroyanagi 2013-10-03 01:44:39 -07:00 committed by Android Git Automerger
commit 372ce55954

View file

@ -139,6 +139,9 @@ const char *const HeaderReadWriteUtils::REQUIRES_FRENCH_LIGATURE_PROCESSING_KEY
int *const writingPos) { int *const writingPos) {
for (AttributeMap::const_iterator it = headerAttributes->begin(); for (AttributeMap::const_iterator it = headerAttributes->begin();
it != headerAttributes->end(); ++it) { it != headerAttributes->end(); ++it) {
if (it->first.empty() || it->second.empty()) {
continue;
}
// Write a key. // Write a key.
if (!buffer->writeCodePointsAndAdvancePosition(&(it->first.at(0)), it->first.size(), if (!buffer->writeCodePointsAndAdvancePosition(&(it->first.at(0)), it->first.size(),
true /* writesTerminator */, writingPos)) { true /* writesTerminator */, writingPos)) {