From 46dc9729ff79eaba516aae044eeed84c1f4e854d Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 7 Jan 2019 15:17:07 -0800
Subject: [PATCH 1/2] Reset ParagraphBuilder after build()

---
 testing/dart/paragraph_builder_test.dart     | 7 +++++++
 third_party/txt/src/txt/paragraph_builder.cc | 1 +
 2 files changed, 8 insertions(+)

diff --git a/testing/dart/paragraph_builder_test.dart b/testing/dart/paragraph_builder_test.dart
index 0743825f8e29b..2bb6579a19ef8 100644
--- a/testing/dart/paragraph_builder_test.dart
+++ b/testing/dart/paragraph_builder_test.dart
@@ -17,4 +17,11 @@ void main() {
     expect(paragraph.width, isNonZero);
     expect(paragraph.height, isNonZero);
   });
+
+  test('PushStyle should not segfault', () {
+    final ParagraphBuilder paragraphBuilder =
+        ParagraphBuilder(ParagraphStyle());
+    paragraphBuilder.build();
+    paragraphBuilder.pushStyle(TextStyle());
+  });
 }
diff --git a/third_party/txt/src/txt/paragraph_builder.cc b/third_party/txt/src/txt/paragraph_builder.cc
index 1a34b367a2226..cd9d1591499d3 100644
--- a/third_party/txt/src/txt/paragraph_builder.cc
+++ b/third_party/txt/src/txt/paragraph_builder.cc
@@ -84,6 +84,7 @@ std::unique_ptr<Paragraph> ParagraphBuilder::Build() {
   paragraph->SetText(std::move(text_), std::move(runs_));
   paragraph->SetParagraphStyle(paragraph_style_);
   paragraph->SetFontCollection(font_collection_);
+  SetParagraphStyle(paragraph_style_);
   return paragraph;
 }
 

From 8f2ddb41264a31716fb2d24a040869f68cde337b Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Mon, 7 Jan 2019 15:20:46 -0800
Subject: [PATCH 2/2] clarify test label

---
 testing/dart/paragraph_builder_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/dart/paragraph_builder_test.dart b/testing/dart/paragraph_builder_test.dart
index 2bb6579a19ef8..d84a8e17c5f66 100644
--- a/testing/dart/paragraph_builder_test.dart
+++ b/testing/dart/paragraph_builder_test.dart
@@ -18,7 +18,7 @@ void main() {
     expect(paragraph.height, isNonZero);
   });
 
-  test('PushStyle should not segfault', () {
+  test('PushStyle should not segfault after build()', () {
     final ParagraphBuilder paragraphBuilder =
         ParagraphBuilder(ParagraphStyle());
     paragraphBuilder.build();