[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 0452e2ab8c19ddb4b1748deadc859552e6869558
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 29 19:09:15 2003 +0000

    	- fixed MIME type leaks that were most of 3272566
    	(several leaks after visiting amazon.com and emptying cache)
    
            Reviewed by Darin
    
            * kwq/KWQPixmap.mm:
            (QPixmap::QPixmap):
            (QPixmap::operator=):
    	fixed two leaks of MIME string
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e385c00..0e0a501 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-05-29  John Sullivan  <sullivan at apple.com>
+
+	- fixed MIME type leaks that were most of 3272566 
+	(several leaks after visiting amazon.com and emptying cache)
+
+        Reviewed by Darin
+
+        * kwq/KWQPixmap.mm:
+        (QPixmap::QPixmap):
+        (QPixmap::operator=):
+	fixed two leaks of MIME string
+
 2003-05-29  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e385c00..0e0a501 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-05-29  John Sullivan  <sullivan at apple.com>
+
+	- fixed MIME type leaks that were most of 3272566 
+	(several leaks after visiting amazon.com and emptying cache)
+
+        Reviewed by Darin
+
+        * kwq/KWQPixmap.mm:
+        (QPixmap::QPixmap):
+        (QPixmap::operator=):
+	fixed two leaks of MIME string
+
 2003-05-29  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index f262b36..78adbac 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -79,7 +79,6 @@ QPixmap::QPixmap(const QByteArray &bytes, void *MIME)
 {
     MIMEType = (NSString *)[((NSString *)MIME) copy];
     imageRenderer = [[[WebCoreImageRendererFactory sharedFactory] imageRendererWithBytes:bytes.data() length:bytes.size() MIMEType:(NSString *)MIMEType] retain];
-    MIMEType = 0;
     needCopyOnWrite = false;
 }
 
@@ -188,7 +187,9 @@ QPixmap &QPixmap::operator=(const QPixmap &assignFrom)
     [assignFrom.imageRenderer retain];
     [imageRenderer release];
     imageRenderer = assignFrom.imageRenderer;
-    MIMEType = [assignFrom.MIMEType copy];
+    NSString *newMIMEType = [assignFrom.MIMEType copy];
+    [MIMEType release];
+    MIMEType = newMIMEType;
     assignFrom.needCopyOnWrite = true;
     needCopyOnWrite = true;
     return *this;

-- 
WebKit Debian packaging