提交 2c389678 编写于 作者: K KyleWong 提交者: Jason Simmons

Fix a minikin crash (nullptr& EXC_BAD_ACCESS) on iOS8. (#6795)

* Fix a minikin crash (nullptr& EXC_BAD_ACCESS) on iOS8.

* Use find for vector to avoid side effect.
上级 faabf0ce
......@@ -132,8 +132,12 @@ FontCollection::GetMinikinFontCollectionForFamily(
minikin_family,
};
if (enable_font_fallback_) {
for (std::string fallback_family : fallback_fonts_for_locale_[locale])
minikin_families.push_back(fallback_fonts_[fallback_family]);
for (std::string fallback_family : fallback_fonts_for_locale_[locale]) {
auto it = fallback_fonts_.find(fallback_family);
if (it != fallback_fonts_.end()) {
minikin_families.push_back(it->second);
}
}
}
// Create the minikin font collection.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册