From 18f918c26433769b819eb5445da18bae7b3ba83e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 7 Feb 2011 20:33:23 +0000 Subject: Fix crash in RenderLayer due to null pointer It is possible that there is no node associated with the RenderLayer after scroll as evidenced by the null check outside the ANDROID_OVERFLOW_SCROLL block. Bug: 3427863 Change-Id: Icbae7677df46eae923460d6f97a6a706f016e89d --- WebCore/rendering/RenderLayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebCore/rendering/RenderLayer.cpp') diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index 00cc020..b850ba3 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -2188,7 +2188,8 @@ RenderLayer::updateScrollInfoAfterLayout() m_hasOverflowScroll = hasOverflowScroll; dirtyZOrderLists(); dirtyStackingContextZOrderLists(); - renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange); + if (renderer()->node()) + renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange); } #endif } -- cgit v1.1