[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 f042e69f595a2cbda57fc48acd77934dfd0e68a4
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 5 00:26:38 2003 +0000

    	- fixed 3279957 -- REGRESSION: assertion failure at launch in
    	Decoder::~Decoder() importing bookmarks
    
    	Richard actually wrote this fix.
            Reviewed by me, Darin
    
            * kwq/WebCoreEncodings.mm:
            (+[WebCoreEncodings decodeData:]):
    	don't use stack-based decoder; use new instead.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3376de8..c8c27ed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-06-04  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3279957 -- REGRESSION: assertion failure at launch in 
+	Decoder::~Decoder() importing bookmarks
+
+	Richard actually wrote this fix.
+        Reviewed by me, Darin
+
+        * kwq/WebCoreEncodings.mm:
+        (+[WebCoreEncodings decodeData:]):
+	don't use stack-based decoder; use new instead. 
+
 2003-06-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3273300, leaks in cssyyparse.  Function forgot to delete
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3376de8..c8c27ed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-06-04  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3279957 -- REGRESSION: assertion failure at launch in 
+	Decoder::~Decoder() importing bookmarks
+
+	Richard actually wrote this fix.
+        Reviewed by me, Darin
+
+        * kwq/WebCoreEncodings.mm:
+        (+[WebCoreEncodings decodeData:]):
+	don't use stack-based decoder; use new instead. 
+
 2003-06-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3273300, leaks in cssyyparse.  Function forgot to delete
diff --git a/WebCore/kwq/WebCoreEncodings.mm b/WebCore/kwq/WebCoreEncodings.mm
index ab7dd70..c648c86 100644
--- a/WebCore/kwq/WebCoreEncodings.mm
+++ b/WebCore/kwq/WebCoreEncodings.mm
@@ -31,9 +31,10 @@
 
 + (NSString *)decodeData:(NSData *)data
 {
-    khtml::Decoder decoder;
-    QString result = decoder.decode(static_cast<const char *>([data bytes]), [data length]);
-    result += decoder.flush();
+    khtml::Decoder *decoder = new khtml::Decoder();
+    QString result = decoder->decode(static_cast<const char *>([data bytes]), [data length]);
+    result += decoder->flush();
+    decoder->deref();
     return result.getNSString();
 }
 

-- 
WebKit Debian packaging