[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
beidson at apple.com
beidson at apple.com
Thu Feb 4 21:25:19 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit fefadea29b8fcee4e91f538fd0190b5061d2bf84
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 23:03:01 2010 +0000
[WebFrame loadRequest:] does not null check the WebCore::Frame
<rdar://problem/7416286> and https://bugs.webkit.org/show_bug.cgi?id=34021
Reviewed by Adele Peterson.
* WebView/WebFrame.mm:
(-[WebFrame loadRequest:]): Null check the WebCore::Frame as it can disappear
out of underneath a WebFrame.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d98319a..bb12dcd 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-22 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Adele Peterson.
+
+ [WebFrame loadRequest:] does not null check the WebCore::Frame
+ <rdar://problem/7416286> and https://bugs.webkit.org/show_bug.cgi?id=34021
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame loadRequest:]): Null check the WebCore::Frame as it can disappear
+ out of underneath a WebFrame.
+
2010-01-22 Peter Kasting <pkasting at google.com>
Reviewed by David Hyatt.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 5f012a6..b4c5334 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -1356,7 +1356,10 @@ static bool needsMicrosoftMessengerDOMDocumentWorkaround()
- (void)loadRequest:(NSURLRequest *)request
{
- _private->coreFrame->loader()->load(request, false);
+ Frame* coreFrame = _private->coreFrame;
+ if (!coreFrame)
+ return;
+ coreFrame->loader()->load(request, false);
}
static NSURL *createUniqueWebDataURL()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list