[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
ap at apple.com
ap at apple.com
Wed Mar 17 18:12:54 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit db3d6d023bafc2fe4350d674c01e0ae51da29c50
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 3 19:34:00 2010 +0000
Reviewed by Timothy Hatcher.
https://bugs.webkit.org/show_bug.cgi?id=35692
<rdar://problem/7703622> Crash when calling abort() on an XHR while in a windowless WebView
* Panels/WebAuthenticationPanel.m: (-[WebAuthenticationPanel runAsModalDialogWithChallenge:]):
Retain the challenge, just like it's done for sheet.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55470 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index bb9fac9..ca1d0ef 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-03 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Timothy Hatcher.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35692
+ <rdar://problem/7703622> Crash when calling abort() on an XHR while in a windowless WebView
+
+ * Panels/WebAuthenticationPanel.m: (-[WebAuthenticationPanel runAsModalDialogWithChallenge:]):
+ Retain the challenge, just like it's done for sheet.
+
2010-03-02 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/mac/Panels/WebAuthenticationPanel.m b/WebKit/mac/Panels/WebAuthenticationPanel.m
index f207d0c..c9442da 100644
--- a/WebKit/mac/Panels/WebAuthenticationPanel.m
+++ b/WebKit/mac/Panels/WebAuthenticationPanel.m
@@ -218,7 +218,9 @@
- (void)runAsModalDialogWithChallenge:(NSURLAuthenticationChallenge *)chall
{
[self setUpForChallenge:chall];
+
usingSheet = FALSE;
+ [chall retain];
NSURLCredential *credential = nil;
if ([[NSApplication sharedApplication] runModalForWindow:panel] == 0) {
@@ -227,6 +229,7 @@
[callback performSelector:selector withObject:chall withObject:credential];
[credential release];
+ [chall release];
}
- (void)runAsSheetOnWindow:(NSWindow *)window withChallenge:(NSURLAuthenticationChallenge *)chall
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list