[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:59:15 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 42eff37762da0efeec49ad104686bc39d32bdbae
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 12 22:10:32 2002 +0000

    	- fixed 3080250 -- Hands-free crash at wired.com in
    	KHTMLPart::slotChildStarted
    
            * kwq/KWQListImpl.mm:
            (KWQListImpl::~KWQListImpl): Set the node of each iterator to NULL too,
    	not just the list. This is the bug fix for the bug above.
            (KWQListIteratorImpl::toFirst): Check for list of NULL.
            (KWQListIteratorImpl::toLast): ditto.
    
            * kwq/KWQSlot.mm: Tweaks.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 247d964..10c5044 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-11-12  Darin Adler  <darin at apple.com>
+
+	- fixed 3080250 -- Hands-free crash at wired.com in
+	KHTMLPart::slotChildStarted
+
+        * kwq/KWQListImpl.mm:
+        (KWQListImpl::~KWQListImpl): Set the node of each iterator to NULL too,
+	not just the list. This is the bug fix for the bug above.
+        (KWQListIteratorImpl::toFirst): Check for list of NULL.
+        (KWQListIteratorImpl::toLast): ditto.
+
+        * kwq/KWQSlot.mm: Tweaks.
+
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
 	This patch lands a rewrite of whitespace-handling in the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 247d964..10c5044 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-11-12  Darin Adler  <darin at apple.com>
+
+	- fixed 3080250 -- Hands-free crash at wired.com in
+	KHTMLPart::slotChildStarted
+
+        * kwq/KWQListImpl.mm:
+        (KWQListImpl::~KWQListImpl): Set the node of each iterator to NULL too,
+	not just the list. This is the bug fix for the bug above.
+        (KWQListIteratorImpl::toFirst): Check for list of NULL.
+        (KWQListIteratorImpl::toLast): ditto.
+
+        * kwq/KWQSlot.mm: Tweaks.
+
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
 	This patch lands a rewrite of whitespace-handling in the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 247d964..10c5044 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-11-12  Darin Adler  <darin at apple.com>
+
+	- fixed 3080250 -- Hands-free crash at wired.com in
+	KHTMLPart::slotChildStarted
+
+        * kwq/KWQListImpl.mm:
+        (KWQListImpl::~KWQListImpl): Set the node of each iterator to NULL too,
+	not just the list. This is the bug fix for the bug above.
+        (KWQListIteratorImpl::toFirst): Check for list of NULL.
+        (KWQListIteratorImpl::toLast): ditto.
+
+        * kwq/KWQSlot.mm: Tweaks.
+
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
 	This patch lands a rewrite of whitespace-handling in the
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index a9e99bb..a5559db 100644
--- a/WebCore/kwq/KWQListImpl.mm
+++ b/WebCore/kwq/KWQListImpl.mm
@@ -93,6 +93,7 @@ KWQListImpl::~KWQListImpl()
     for (KWQListIteratorImpl *it = iterators; it != NULL; it = next) {
         next = it->next;
         it->list = NULL;
+        it->node = NULL;
         it->next = NULL;
         it->prev = NULL;
     }
@@ -526,13 +527,17 @@ uint KWQListIteratorImpl::count() const
 
 void *KWQListIteratorImpl::toFirst()
 {
-    node = list->head;
+    if (list != NULL) {
+        node = list->head;
+    }
     return current();
 }
 
 void *KWQListIteratorImpl::toLast()
 {
-    node = list->tail;
+    if (list != NULL) {
+        node = list->tail;
+    }
     return current();
 }
 
diff --git a/WebCore/kwq/KWQSlot.mm b/WebCore/kwq/KWQSlot.mm
index 23ee37f..2b9fc54 100644
--- a/WebCore/kwq/KWQSlot.mm
+++ b/WebCore/kwq/KWQSlot.mm
@@ -68,7 +68,7 @@ enum FunctionNumber {
     slotWidgetDestructed
 };
 
-KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
+KWQSlot::KWQSlot(QObject *object, const char *member)
 {
     if (KWQNamesMatch(member, SIGNAL(finishedParsing()))) {
         ASSERT(dynamic_cast<DocumentImpl *>(object));
@@ -139,7 +139,7 @@ KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
     
 void KWQSlot::call() const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     
@@ -169,7 +169,7 @@ void KWQSlot::call() const
 
 void KWQSlot::call(bool b) const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     
@@ -189,7 +189,7 @@ void KWQSlot::call(bool b) const
 
 void KWQSlot::call(int i) const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     
@@ -207,7 +207,7 @@ void KWQSlot::call(int i) const
 
 void KWQSlot::call(const QString &string) const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     
@@ -230,7 +230,7 @@ void KWQSlot::call(const QString &string) const
 
 void KWQSlot::call(Job *job) const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     
@@ -245,7 +245,7 @@ void KWQSlot::call(Job *job) const
 
 void KWQSlot::call(DocLoader *loader, CachedObject *cachedObject) const
 {
-    if (!m_object) {
+    if (m_object.isNull()) {
         return;
     }
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list