[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 00b059a9991a7ca5a2389f783b1d608b0a0be85e
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 17:10:38 2010 +0000

    2010-09-02  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            WebInspector: Timeline instrumentation code can crash browser.
    
            Steps:
            1) load the site
            2) open inspector
            3) start timeline recording
            4) reload inspected page
            got NPE
    
            https://bugs.webkit.org/show_bug.cgi?id=45098
    
            * loader/ResourceLoader.cpp:
            (WebCore::ResourceLoader::didReceiveResponse):
            (WebCore::ResourceLoader::didReceiveData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06b0aa6..b744c82 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-02  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        WebInspector: Timeline instrumentation code can crash browser.
+
+        Steps:
+        1) load the site
+        2) open inspector
+        3) start timeline recording
+        4) reload inspected page
+        got NPE
+
+        https://bugs.webkit.org/show_bug.cgi?id=45098
+
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::didReceiveResponse):
+        (WebCore::ResourceLoader::didReceiveData):
+
 2010-09-02  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index c7308b9..73dacd6 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -401,7 +401,7 @@ void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse&
 {
 #if ENABLE(INSPECTOR)
     if (InspectorTimelineAgent::instanceCount()) {
-        InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+        InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
         if (timelineAgent)
             timelineAgent->willReceiveResourceResponse(identifier(), response);
     }
@@ -413,7 +413,7 @@ void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse&
     didReceiveResponse(response);
 #if ENABLE(INSPECTOR)
     if (InspectorTimelineAgent::instanceCount()) {
-        InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+        InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
         if (timelineAgent)
             timelineAgent->didReceiveResourceResponse();
     }
@@ -424,7 +424,7 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
 {
 #if ENABLE(INSPECTOR)
     if (InspectorTimelineAgent::instanceCount()) {
-        InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+        InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
         if (timelineAgent)
             timelineAgent->willReceiveResourceData(identifier());
     }
@@ -432,7 +432,7 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
     didReceiveData(data, length, lengthReceived, false);
 #if ENABLE(INSPECTOR)
     if (InspectorTimelineAgent::instanceCount()) {
-        InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+        InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
         if (timelineAgent)
             timelineAgent->didReceiveResourceData();
     }

-- 
WebKit Debian packaging