[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
sullivan at apple.com
sullivan at apple.com
Wed Dec 22 17:54:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0c6a8b5d5713a25a76e13fcd7b4c9403ff7fb9b6
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 17:39:26 2010 +0000
Slightly speculative fix for:
Reviewed by Adam Roben.
<rdar://problem/8712674>
<https://bugs.webkit.org/show_bug.cgi?id=50393>
setStringValue: sometimes called with nil in [WebAuthenticationPanel setUpForChallenge]
* Panels/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel setUpForChallenge:]):
If the realm is nil, use @"" instead.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73143 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 76428a4..2cc9af2 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-02 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Slightly speculative fix for:
+
+ <rdar://problem/8712674>
+ <https://bugs.webkit.org/show_bug.cgi?id=50393>
+ setStringValue: sometimes called with nil in [WebAuthenticationPanel setUpForChallenge]
+
+ * Panels/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel setUpForChallenge:]):
+ If the realm is nil, use @"" instead.
+
2010-12-01 Jia Pu <jpu at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/mac/Panels/WebAuthenticationPanel.m b/WebKit/mac/Panels/WebAuthenticationPanel.m
index c9442da..a8b4764 100644
--- a/WebKit/mac/Panels/WebAuthenticationPanel.m
+++ b/WebKit/mac/Panels/WebAuthenticationPanel.m
@@ -129,6 +129,8 @@
}
NSString *realm = [space realm];
+ if (!realm)
+ realm = @"";
NSString *message;
// Consider the realm name to be "simple" if it does not contain any whitespace or newline characters.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list