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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 21db5f048b27c38883f6bca11a55c45d028ee0ae
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Feb 15 18:50:36 2004 +0000

            Reviewed by Dave.
    
            - fixed 3548533: crash in XMLHttpRequest::slotData using Orkut's rating system
    
            * khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::~XMLHttpRequest):
            Delete the QObject side, which has a side effect of disconnecting the
            signals which seem to be firing after the request is gone. There may be
            another way of addressing the crash by correcting some other problem with
            killing the job, but this demonstrably works and fixes a storage leak.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 268011b..599686a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-02-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3548533: crash in XMLHttpRequest::slotData using Orkut's rating system
+
+        * khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::~XMLHttpRequest):
+        Delete the QObject side, which has a side effect of disconnecting the
+        signals which seem to be firing after the request is gone. There may be
+        another way of addressing the crash by correcting some other problem with
+        killing the job, but this demonstrably works and fixes a storage leak.
+
 2004-02-12  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/ecma/xmlhttprequest.cpp b/WebCore/khtml/ecma/xmlhttprequest.cpp
index ceadfcc..0c62866 100644
--- a/WebCore/khtml/ecma/xmlhttprequest.cpp
+++ b/WebCore/khtml/ecma/xmlhttprequest.cpp
@@ -90,7 +90,7 @@ void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url)
 }
 
 XMLHttpRequestConstructorImp::XMLHttpRequestConstructorImp(ExecState *, const DOM::Document &d)
-    : ObjectImp(), doc(d)
+    : doc(d)
 {
 }
 
@@ -223,6 +223,7 @@ XMLHttpRequest::XMLHttpRequest(ExecState *exec, const DOM::Document &d)
 
 XMLHttpRequest::~XMLHttpRequest()
 {
+  delete qObject;
   if (decoder) {
     decoder->deref();
   }

-- 
WebKit Debian packaging