[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:30:31 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 4e6d52ce1605cfac382576c75db87bd03a8529eb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 9 16:10:25 2002 +0000

    	- fixed 3020594 -- crash in KWQKHTMLPartImpl::end() visiting particular page
    
            * khtml/khtml_part.cpp: (KHTMLPart::end): Our hacked alternative to a signal
    	requires a NULL check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1784 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f2d3d02..720c877 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 3020594 -- crash in KWQKHTMLPartImpl::end() visiting particular page
+
+        * khtml/khtml_part.cpp: (KHTMLPart::end): Our hacked alternative to a signal
+	requires a NULL check.
+
 2002-08-08  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix to get onLoad to fire, so the iBench test works.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f2d3d02..720c877 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 3020594 -- crash in KWQKHTMLPartImpl::end() visiting particular page
+
+        * khtml/khtml_part.cpp: (KHTMLPart::end): Our hacked alternative to a signal
+	requires a NULL check.
+
 2002-08-08  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix to get onLoad to fire, so the iBench test works.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f2d3d02..720c877 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-08-09  Darin Adler  <darin at apple.com>
+
+	- fixed 3020594 -- crash in KWQKHTMLPartImpl::end() visiting particular page
+
+        * khtml/khtml_part.cpp: (KHTMLPart::end): Our hacked alternative to a signal
+	requires a NULL check.
+
 2002-08-08  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix to get onLoad to fire, so the iBench test works.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 4b620a8..4607450 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1453,12 +1453,13 @@ void KHTMLPart::end()
         write(d->m_decoder->flush());
     if (d->m_doc)
 	d->m_doc->finishParsing();
+
 #ifdef APPLE_CHANGES
     KURL::clearCaches();
 
-    // FIXME: Would be better if we could just count on the signal
-    // instead of doing this.
-    slotFinishedParsing();
+    // FIXME: Would be better if we could just count on the signal instead of doing this.
+    if (d->m_doc)
+        slotFinishedParsing();
 #endif
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list