Bug 1524411 - Null-check kid in nsLayoutUtils::GetFirstLinePosition()…

…. r=dholbert Differential Revision: https://phabricator.services.mozilla.com/D34247 --HG-- extra : moz-landing-system : lando
dothq · Jun 13, 2019 · dbbf8bb · dbbf8bb
1 parent efb4e81
commit dbbf8bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/layout/base/crashtests/1524411.html b/layout/base/crashtests/1524411.html
@@ -0,0 +1,15 @@
+<style>
+:not(text) {
+  break-inside: avoid;
+}
+* {
+  columns: 0px;
+  padding-top: 87px;
+}
+</style>
+<ol style="font: 1em/1 Ahem, sans-serif">
+A
+A
+<li style="rotate:1deg; float:left">
+<hr>
+A
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
@@ -562,6 +562,7 @@ load 1510485.html
 pref(layout.css.column-span.enabled,true) load 1511535.html
 load 1511563.html
 pref(layout.css.column-span.enabled,true) load 1524382.html
+pref(layout.css.column-span.enabled,true) load 1524411.html
 pref(layout.css.column-span.enabled,true) load 1533885.html
 pref(layout.css.column-span.enabled,true) load 1534146.html
 load 1535945.html

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
@@ -6320,7 +6320,7 @@ bool nsLayoutUtils::GetFirstLinePosition(WritingMode aWM,
       LinePosition kidPosition;
       nsIFrame* kid = aFrame->PrincipalChildList().FirstChild();
       // If aFrame is fieldset, kid might be a legend frame here, but that's ok.
-      if (GetFirstLinePosition(aWM, kid, &kidPosition)) {
+      if (kid && GetFirstLinePosition(aWM, kid, &kidPosition)) {
         *aResult = kidPosition +
                    kid->GetLogicalNormalPosition(aWM, aFrame->GetSize()).B(aWM);
         return true;