libtxt: be more resilient if the minikin glyphs and the grapheme brea…

…ker get out of sync (flutter#4590)
agd · Jan 26, 2018 · c9b1e03 · c9b1e03
1 parent a1e4f2f
commit c9b1e03
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/third_party/txt/src/txt/paragraph.cc b/third_party/txt/src/txt/paragraph.cc
@@ -545,17 +545,23 @@ void Paragraph::Layout(double width, bool force) {
           int32_t next_grapheme;
           if (run.is_rtl()) {
             next_grapheme = grapheme_breaker_->previous();
+            if (next_grapheme == icu::BreakIterator::DONE)
+              break;
             subglyph_code_unit_counts.push_back(current_grapheme -
                                                 next_grapheme);
           } else {
             next_grapheme = grapheme_breaker_->next();
+            if (next_grapheme == icu::BreakIterator::DONE)
+              break;
             subglyph_code_unit_counts.push_back(next_grapheme -
                                                 current_grapheme);
             while (next_grapheme < static_cast<int32_t>(text_count)) {
               if (layout.getCharAdvance(next_grapheme) != 0)
                 break;
-              size_t sub_grapheme = grapheme_breaker_->current();
-              next_grapheme = grapheme_breaker_->next();
+              if (grapheme_breaker_->next() == icu::BreakIterator::DONE)
+                break;
+              size_t sub_grapheme = next_grapheme;
+              next_grapheme = grapheme_breaker_->current();
               subglyph_code_unit_counts.push_back(next_grapheme - sub_grapheme);
             }
           }
@@ -590,6 +596,9 @@ void Paragraph::Layout(double width, bool force) {
           }
         }
 
+        if (glyph_positions.empty())
+          continue;
+
         SkPaint::FontMetrics metrics;
         paint.getFontMetrics(&metrics);
         paint_records.emplace_back(run.style(), SkPoint::Make(run_x_offset, 0),