Commit d2f61674 authored by ggaren@apple.com's avatar ggaren@apple.com

2011-01-30 Geoffrey Garen <ggaren@apple.com>

        Reviewed by Maciej Stachowiak.

        Fixed crash on window close (maybe crash on launch?) due to missing
        frame null checks
        https://bugs.webkit.org/show_bug.cgi?id=53408

        * UIProcess/WebContext.cpp:
        (WebKit::WebContext::didNavigateWithNavigationData):
        (WebKit::WebContext::didPerformClientRedirect):
        (WebKit::WebContext::didPerformServerRedirect):
        (WebKit::WebContext::didUpdateHistoryTitle): Check for NULL, since we're
        calling a function that can return it.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77102 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9d92cc2a
2011-01-30 Geoffrey Garen <ggaren@apple.com>
Reviewed by Maciej Stachowiak.
Fixed crash on window close (maybe crash on launch?) due to missing
frame null checks
https://bugs.webkit.org/show_bug.cgi?id=53408
* UIProcess/WebContext.cpp:
(WebKit::WebContext::didNavigateWithNavigationData):
(WebKit::WebContext::didPerformClientRedirect):
(WebKit::WebContext::didPerformServerRedirect):
(WebKit::WebContext::didUpdateHistoryTitle): Check for NULL, since we're
calling a function that can return it.
2011-01-30 Balazs Kelemen <kbalazs@webkit.org>
Reviewed by Csaba Osztrogonác.
......@@ -299,7 +299,7 @@ void WebContext::didReceiveSynchronousMessageFromInjectedBundle(const String& me
void WebContext::didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore& store, uint64_t frameID)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
if (!frame->page())
if (!frame || !frame->page())
return;
m_historyClient.didNavigateWithNavigationData(this, frame->page(), store, frame);
......@@ -308,7 +308,7 @@ void WebContext::didNavigateWithNavigationData(uint64_t pageID, const WebNavigat
void WebContext::didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
if (!frame->page())
if (!frame || !frame->page())
return;
m_historyClient.didPerformClientRedirect(this, frame->page(), sourceURLString, destinationURLString, frame);
......@@ -317,7 +317,7 @@ void WebContext::didPerformClientRedirect(uint64_t pageID, const String& sourceU
void WebContext::didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
if (!frame->page())
if (!frame || !frame->page())
return;
m_historyClient.didPerformServerRedirect(this, frame->page(), sourceURLString, destinationURLString, frame);
......@@ -326,7 +326,7 @@ void WebContext::didPerformServerRedirect(uint64_t pageID, const String& sourceU
void WebContext::didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
if (!frame->page())
if (!frame || !frame->page())
return;
m_historyClient.didUpdateHistoryTitle(this, frame->page(), title, url, frame);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment