Title: [134827] branches/safari-536.28-branch/Source/WebKit/mac
- Revision
- 134827
- Author
- [email protected]
- Date
- 2012-11-15 13:38:53 -0800 (Thu, 15 Nov 2012)
Log Message
Merged r133977. <rdar://problem/12674097>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit/mac/ChangeLog (134826 => 134827)
--- branches/safari-536.28-branch/Source/WebKit/mac/ChangeLog 2012-11-15 21:36:25 UTC (rev 134826)
+++ branches/safari-536.28-branch/Source/WebKit/mac/ChangeLog 2012-11-15 21:38:53 UTC (rev 134827)
@@ -1,3 +1,23 @@
+2012-11-15 Lucas Forschler <[email protected]>
+
+ Merge r133977
+
+ 2012-11-08 Roger Fong <[email protected]>
+
+ Null check URL key entries into WebHistory hash table.
+ https://bugs.webkit.org/show_bug.cgi?id=101664
+ <rdar://problem/12440852>
+
+ Reviewed by Brady Eidson.
+
+ Sometimes the _entriesByURL hash table used to keep track of web history is erroneously passed in null key entries, which causes an exception to fire.
+ This prevents the desired page navigation from taking effect. This is a workaround for the problem.
+ Ideally we would figure out where the null values for the key are coming from but for now we'll just set it to "" to prevent the exception from being thrown
+ so that navigation can continue as expected.
+
+ * History/WebHistory.mm:
+ (-[WebHistoryPrivate visitedURL:withTitle:increaseVisitCount:]):
+
2012-11-12 Lucas Forschler <[email protected]>
Merge r131018
Modified: branches/safari-536.28-branch/Source/WebKit/mac/History/WebHistory.mm (134826 => 134827)
--- branches/safari-536.28-branch/Source/WebKit/mac/History/WebHistory.mm 2012-11-15 21:36:25 UTC (rev 134826)
+++ branches/safari-536.28-branch/Source/WebKit/mac/History/WebHistory.mm 2012-11-15 21:38:53 UTC (rev 134827)
@@ -296,6 +296,8 @@
ASSERT(title);
NSString *URLString = [url _web_originalDataAsString];
+ if (!URLString)
+ URLString = @"";
WebHistoryItem *entry = [_entriesByURL objectForKey:URLString];
if (entry) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
