From: Jeffrey Pfau <jpfau@apple.com>
Date: Fri, 6 Mar 2015 07:33:11 +0000 (+0000)
Subject: Check for NULL pointer in FrameProgressTracker
X-Git-Tag: archive/raspbian/2.14.3-1+rpi1~1^2^2^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c45e7dae78f10556c774b3acce0dc392777f5150;p=webkit2gtk.git

Check for NULL pointer in FrameProgressTracker

===================================================================

Gbp-Pq: Name nullptr-frameprogresstracker.patch
---

diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index cd716d957e..aa47372d99 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -189,8 +189,7 @@ public:
 
     ~FrameProgressTracker()
     {
-        ASSERT(!m_inProgress || m_frame.page());
-        if (m_inProgress)
+        if (m_inProgress && m_frame.page())
             m_frame.page()->progress().progressCompleted(m_frame);
     }