Commit 4dbf6432 authored by beidson's avatar beidson

Reviewed by Dave Harrison

        <rdar://problem/4801066>
        Added a critical null frameLoader() check

        * loader/mac/MainResourceLoaderMac.mm:
        (WebCore::MainResourceLoader::loadNow):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17622 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 581c07bc
2006-11-06 Brady Eidson <beidson@apple.com>
Reviewed by Dave Harrison
<rdar://problem/4801066>
Added a critical null frameLoader() check
* loader/mac/MainResourceLoaderMac.mm:
(WebCore::MainResourceLoader::loadNow):
2006-11-06 David Harrison <harrison@apple.com>
Reviewed by Darin.
......@@ -349,6 +349,12 @@ NSURLRequest *MainResourceLoader::loadNow(NSURLRequest *r)
// we no longer send the callback from within NSURLConnection for
// initial requests.
r = willSendRequest(r, nil);
// <rdar://problem/4801066>
// willSendRequest() is liable to make the call to frameLoader() return NULL, so we need to check that here
if (!frameLoader())
return nil;
NSURL *URL = [r URL];
bool shouldLoadEmpty = shouldLoadAsEmptyDocument(URL);
......
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