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

[darin]

The following commit has been merged in the debian/unstable branch:
commit adb8111c18a5fc3354f4c045e58870f786340894
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 27 17:08:08 2002 +0000

    WebCore:
    
            * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
    	particular failure case.
    
    WebKit:
    
            * Bookmarks.subproj/WebBookmarkProxy.m: (-[WebBookmarkProxy dealloc]):
    	Added, so we don't leak the title.
    
            * Bookmarks.subproj/WebBookmarkGroup.m: (-[WebBookmarkGroup removeBookmark:]):
            * Bookmarks.subproj/WebBookmarkList.m: (-[WebBookmarkList removeChild:]):
    	Added retain/release pairs so we don't use an object after it's deallocated.
    	In practice this doesn't happen the way these are used by Alex since they are
    	in an array, but they have windows of vulnerability depending on exactly how
    	they are used.
    
    WebBrowser:
    
            * BookmarksController.m:
            (-[BookmarksController _blessOrCreateSpecialFolders]):
    	Fix indenting.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 42fa4c4..5421ecd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-10-27  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
+	particular failure case.
+
 2002-10-26  Darin Adler  <darin at apple.com>
 
 	- fixed a bug in the WebCore cache that caused it to not cache very much after
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 42fa4c4..5421ecd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-10-27  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
+	particular failure case.
+
 2002-10-26  Darin Adler  <darin at apple.com>
 
 	- fixed a bug in the WebCore cache that caused it to not cache very much after
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 42fa4c4..5421ecd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-10-27  Darin Adler  <darin at apple.com>
+
+        * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
+	particular failure case.
+
 2002-10-26  Darin Adler  <darin at apple.com>
 
 	- fixed a bug in the WebCore cache that caused it to not cache very much after
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index ca490e0..5e7dc8b 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -116,6 +116,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
     [resourceLoader release];
 
     if (handle == nil) {
+        delete job;
         return false;
     }
     
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 9d33d56..8cfd951 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -116,8 +116,10 @@
     if (bookmark == _topBookmark) {
         [self _setTopBookmark:nil];
     } else {
+        [bookmark retain];
         [[bookmark parent] removeChild:bookmark];
         [bookmark _setGroup:nil];
+        [bookmark release];
     }
 }
 
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index 36d302a..a01998e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -188,8 +188,10 @@
     ASSERT_ARG(bookmark, [bookmark parent] == self);
     ASSERT_ARG(bookmark, [_list containsObject:bookmark]);
     
+    [bookmark retain];
     [_list removeObject:bookmark];
     [bookmark _setParent:nil];
+    [bookmark release];
 
     [[self group] _bookmarkChildrenDidChange:self]; 
 }
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkProxy.m b/WebKit/Bookmarks.subproj/WebBookmarkProxy.m
index 22962e0..cfaeb0e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkProxy.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkProxy.m
@@ -41,6 +41,12 @@
     return result;
 }
 
+- (void)dealloc
+{
+    [_title release];
+    [super dealloc];
+}
+
 - (NSDictionary *)dictionaryRepresentation
 {
     NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:2];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b248d6b..7eaa04c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-27  Darin Adler  <darin at apple.com>
+
+        * Bookmarks.subproj/WebBookmarkProxy.m: (-[WebBookmarkProxy dealloc]):
+	Added, so we don't leak the title.
+
+        * Bookmarks.subproj/WebBookmarkGroup.m: (-[WebBookmarkGroup removeBookmark:]):
+        * Bookmarks.subproj/WebBookmarkList.m: (-[WebBookmarkList removeChild:]):
+	Added retain/release pairs so we don't use an object after it's deallocated.
+	In practice this doesn't happen the way these are used by Alex since they are
+	in an array, but they have windows of vulnerability depending on exactly how
+	they are used.
+
 2002-10-26  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/WebViewFactory.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b248d6b..7eaa04c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-27  Darin Adler  <darin at apple.com>
+
+        * Bookmarks.subproj/WebBookmarkProxy.m: (-[WebBookmarkProxy dealloc]):
+	Added, so we don't leak the title.
+
+        * Bookmarks.subproj/WebBookmarkGroup.m: (-[WebBookmarkGroup removeBookmark:]):
+        * Bookmarks.subproj/WebBookmarkList.m: (-[WebBookmarkList removeChild:]):
+	Added retain/release pairs so we don't use an object after it's deallocated.
+	In practice this doesn't happen the way these are used by Alex since they are
+	in an array, but they have windows of vulnerability depending on exactly how
+	they are used.
+
 2002-10-26  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/WebViewFactory.m:

-- 
WebKit Debian packaging