Changeset 92050 in webkit

Timestamp:

Jul 30, 2011 4:43:07 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

MessageQueue::waitForMessageFilteredWithTimeout can triggers an assertion
​https://bugs.webkit.org/show_bug.cgi?id=65263

Reviewed by Dmitry Titov.

• wtf/Deque.h:

(WTF::::operator): Don't check the validity of an iterator
that will be reassigned right now.

• wtf/MessageQueue.h:

(WTF::::removeIf): Revert r51198 as I beleave this is the better
solution for the problem that was solved by that.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Deque.h (modified) (1 diff)
• wtf/MessageQueue.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-30  Balazs Kelemen  <kbalazs@webkit.org>
+
+        MessageQueue::waitForMessageFilteredWithTimeout can triggers an assertion
+        https://bugs.webkit.org/show_bug.cgi?id=65263
+
+        Reviewed by Dmitry Titov.
+
+        * wtf/Deque.h:
+        (WTF::::operator): Don't check the validity of an iterator
+        that will be reassigned right now.
+        * wtf/MessageQueue.h:
+        (WTF::::removeIf): Revert r51198 as I beleave this is the better
+        solution for the problem that was solved by that.
+
 2011-07-29  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Deque.h

@@ -614 +614 @@
     inline DequeIteratorBase<T, inlineCapacity>& DequeIteratorBase<T, inlineCapacity>::operator=(const Base& other)
     {
-        checkValidity();
         other.checkValidity();
         removeFromIteratorsList();

trunk/Source/JavaScriptCore/wtf/MessageQueue.h

@@ -173 +173 @@
     {
         MutexLocker lock(m_mutex);
-        // See bug 31657 for why this loop looks so weird
-        while (true) {
-            DequeConstIterator<DataType*> found = m_queue.findIf(predicate);
-            if (found == m_queue.end())
-                break;
-
+        DequeConstIterator<DataType*> found = m_queue.end();
+        while ((found = m_queue.findIf(predicate)) != m_queue.end()) {
             DataType* message = *found;
             m_queue.remove(found);
             delete message;
-       }
+        }
     }