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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 20b0ea1d28adc19a91277c0bcc8cbc8a788db582
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 23 15:49:35 2002 +0000

    2002-04-23  Kenneth Kocienda  <kocienda at apple.com>
    
            * kwq/KWQPixmap.mm:
            (QPixmap::QPixmap): Fixed unneeded leak of an NSImage in
            the case where we are still covering for a double-release
            bug in AppKit. No need to add insult to injury. :)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3ab3f62..5821759 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-23  Kenneth Kocienda  <kocienda at apple.com>
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap): Fixed unneeded leak of an NSImage in
+        the case where we are still covering for a double-release
+        bug in AppKit. No need to add insult to injury. :)
+
 2002-04-22  Darin Adler  <darin at apple.com>
 
 	Fix width of non-breaking spaces. There's code to hack this
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3ab3f62..5821759 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-04-23  Kenneth Kocienda  <kocienda at apple.com>
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap): Fixed unneeded leak of an NSImage in
+        the case where we are still covering for a double-release
+        bug in AppKit. No need to add insult to injury. :)
+
 2002-04-22  Darin Adler  <darin at apple.com>
 
 	Fix width of non-breaking spaces. There's code to hack this
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3ab3f62..5821759 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-04-23  Kenneth Kocienda  <kocienda at apple.com>
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap): Fixed unneeded leak of an NSImage in
+        the case where we are still covering for a double-release
+        bug in AppKit. No need to add insult to injury. :)
+
 2002-04-22  Darin Adler  <darin at apple.com>
 
 	Fix width of non-breaking spaces. There's code to hack this
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 681e405..ad18d7d 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -55,9 +55,11 @@ QPixmap::QPixmap(const QByteArray &bytes)
     }
     else if ([[nsimage representations] count] == 0) {
         KWQDEBUG("unable to create image [can't decode bytes]");
-        // leak the ns image pointer
+        // if there are no representations, release the image
+        // and return nil
         // note that the data is freed erroneously by AppKit
-        // we're not leaking that, just the nsimage pointer
+        // we're not leaking that
+        [nsimage release];
         nsimage = nil;
     }
     else {

-- 
WebKit Debian packaging