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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:00:15 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 0fd0e7f620fa9b72f1c8b50fbf881822e99f98b7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 19:35:05 2002 +0000

    	* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
            Fix a leak I introduced here by copying the string in a better way.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 19a2967..99ba1e5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-02  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
+        Fix a leak I introduced here by copying the string in a better way.
+
 2002-04-01  Richard Williamson  <rjw at apple.com>
 
         Cleaned up lots of potentially stale references to controller.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 19a2967..99ba1e5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-04-02  Darin Adler  <darin at apple.com>
+
+	* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _setTitle:]):
+        Fix a leak I introduced here by copying the string in a better way.
+
 2002-04-01  Richard Williamson  <rjw at apple.com>
 
         Cleaned up lots of potentially stale references to controller.
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index ec2403a..a7c59f4 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -212,7 +212,7 @@
 {
     IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
     
-    NSMutableString *trimmed = [title mutableCopy];
+    NSMutableString *trimmed = [NSMutableString stringWithString:title];
     CFStringTrimWhitespace((CFMutableStringRef) trimmed);
     if ([trimmed length] == 0) {
         trimmed = nil;
@@ -227,7 +227,7 @@
     data->pageTitle = [[NSString stringWithString:trimmed] retain];
     
     // The title doesn't get communicated to the controller until
-    // we reach the committed state for this datasource's frame.
+    // we reach the committed state for this data source's frame.
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index ec2403a..a7c59f4 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -212,7 +212,7 @@
 {
     IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
     
-    NSMutableString *trimmed = [title mutableCopy];
+    NSMutableString *trimmed = [NSMutableString stringWithString:title];
     CFStringTrimWhitespace((CFMutableStringRef) trimmed);
     if ([trimmed length] == 0) {
         trimmed = nil;
@@ -227,7 +227,7 @@
     data->pageTitle = [[NSString stringWithString:trimmed] retain];
     
     // The title doesn't get communicated to the controller until
-    // we reach the committed state for this datasource's frame.
+    // we reach the committed state for this data source's frame.
 }
 
 @end

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list