commit 56463a52c19062aae422f8b66ab866ec36d7712d
author Ben Murdoch <benm@google.com> Mon Feb 07 20:33:23 2011 +0000
committer android-merger <android-build@android.com> Tue Feb 08 00:42:15 2011 -0800
tree 333f302deac3987e641073021045725a88323d46
parent 6553cae1cba68ccc98771d9707b575080ba9cceb

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

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 @@
         m_hasOverflowScroll = hasOverflowScroll;
         dirtyZOrderLists();
         dirtyStackingContextZOrderLists();
-        renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange);
+        if (renderer()->node())
+            renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange);
     }
 #endif
 }