[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 0e2119c69a123307338f8439a7b68d50c50f90a1
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 23:33:08 2003 +0000

    	- fixed 3160116 -- REGRESSION:leak in WebBookmarkLeaf at startup
    
            Reviewed by Darin
    
            * Bookmarks.subproj/WebBookmarkLeaf.m:
            (-[WebBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
    	don't leak the _entry that was created in initWithURLString:title:group:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index b9164b5..50b3fe8 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -56,6 +56,10 @@
         return nil;
     }
 
+    // _entry was already created in initWithURLString:title:group, called from super.
+    // Releasing it here and creating a new one is inelegant, and we should probably
+    // improve this someday (but timing tests show no noticeable slowdown).
+    [_entry release];
     _entry = [[WebHistoryItem alloc] initFromDictionaryRepresentation:
         [dict objectForKey:URIDictionaryKey]];
     _URLString = [[dict objectForKey:URLStringKey] copy];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d4beb0d..88eb545 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-29  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3160116 -- REGRESSION:leak in WebBookmarkLeaf at startup
+
+        Reviewed by Darin
+
+        * Bookmarks.subproj/WebBookmarkLeaf.m:
+        (-[WebBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
+	don't leak the _entry that was created in initWithURLString:title:group:
+
 2003-01-29  Trey Matteson  <trey at apple.com>
 
 	3159750 - REGRESSION: cursor is I-beam when over a standalone image

-- 
WebKit Debian packaging