[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit f526100e55290cbde8918714fd54f18b4c37c67d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 28 17:36:41 2002 +0000

    	* History.subproj/IFWebHistoryPrivate.m:
    	(-[IFWebHistoryPrivate _loadHistoryGuts:]):
    	Made this more robust about bad data from the disk file. I
    	don't know how bad data could get into the disk file in normal
    	use, but it seems to have happened to Richard.
    
    	* AppController.m: (-[AppController menuTitleForURL:withTitle:]),
    	(-[AppController _menuTitleForURIEntry:]), (-[AppController
    	insertHistoryEntry:intoMenu:atIndex:]): Added asserts in various
    	places to catch bad callers earlier.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@877 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e94f279..b425781 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-28  John Sullivan  <sullivan at apple.com>
+
+	* History.subproj/IFWebHistoryPrivate.m: 
+	(-[IFWebHistoryPrivate _loadHistoryGuts:]):
+	Made this more robust about bad data from the disk file. I
+	don't know how bad data could get into the disk file in normal
+	use, but it seems to have happened to Richard.
+
 2002-03-27  Richard Williamson  <rjw at apple.com>
 
         Added initial-layout-after-delay-if-not-layed-out-yet feature.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e94f279..b425781 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-03-28  John Sullivan  <sullivan at apple.com>
+
+	* History.subproj/IFWebHistoryPrivate.m: 
+	(-[IFWebHistoryPrivate _loadHistoryGuts:]):
+	Made this more robust about bad data from the disk file. I
+	don't know how bad data could get into the disk file in normal
+	use, but it seems to have happened to Richard.
+
 2002-03-27  Richard Williamson  <rjw at apple.com>
 
         Added initial-layout-after-delay-if-not-layed-out-yet feature.
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.m b/WebKit/History.subproj/IFWebHistoryPrivate.m
index 63cd21d..a145105 100644
--- a/WebKit/History.subproj/IFWebHistoryPrivate.m
+++ b/WebKit/History.subproj/IFWebHistoryPrivate.m
@@ -350,6 +350,11 @@
 
         entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: (NSDictionary *)object];
 
+        if ([entry url] == nil) {
+            // entry without url is useless; data on disk must have been bad; ignore this one
+            continue;
+        }
+
         // test against date limit
         if (!ageLimitPassed) {
             if ([[entry lastVisitedDate] compareDay:ageLimitDate] != NSOrderedDescending) {
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 63cd21d..a145105 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -350,6 +350,11 @@
 
         entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: (NSDictionary *)object];
 
+        if ([entry url] == nil) {
+            // entry without url is useless; data on disk must have been bad; ignore this one
+            continue;
+        }
+
         // test against date limit
         if (!ageLimitPassed) {
             if ([[entry lastVisitedDate] compareDay:ageLimitDate] != NSOrderedDescending) {

-- 
WebKit Debian packaging