Bug 1116104 - Null-check the do_QueryFrame result before using it. r=roc

This commit is contained in:
Mats Palmgren 2014-12-31 07:10:11 +00:00
parent 2fd48d0600
commit 0c7df5b92f
3 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,15 @@
<html>
<head>
</head>
<body>
<style>colgroup::after { content:"after"; }</style>
<table>
<colgroup><col style="display: inline;">t</col></colgroup>
</table>
</body>
</html>

View File

@ -454,4 +454,5 @@ load 973390-1.html
load 1001237.html
load 1043163-1.html
load 1061028.html
load 1116104.html
load 1107508-1.html

View File

@ -6070,8 +6070,11 @@ AdjustAppendParentForAfterContent(nsFrameManager* aFrameManager,
if (child && child->IsPseudoFrame(aContainer) &&
!child->IsGeneratedContentFrame()) {
// Drill down into non-generated pseudo frames of aContainer.
parent = nsLayoutUtils::LastContinuationWithChild(do_QueryFrame(child));
continue;
nsContainerFrame* childAsContainer = do_QueryFrame(child);
if (childAsContainer) {
parent = nsLayoutUtils::LastContinuationWithChild(childAsContainer);
continue;
}
}
for (; child; child = child->GetPrevSibling()) {