Changeset 51198 in webkit

Timestamp:

Nov 19, 2009 11:59:38 AM (14 years ago)

Author:

dumi@chromium.org

Message:

Fixing a bug in MessageQueue::removeIf() that leads to an
assertion failure.

Reviewed by Dmitry Titov.

​https://bugs.webkit.org/show_bug.cgi?id=31657

• wtf/MessageQueue.h:

(WTF::MessageQueue::removeIf):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-11-19  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Fixing a bug in MessageQueue::removeIf() that leads to an
+        assertion failure.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31657
+
+        * wtf/MessageQueue.h:
+        (WTF::MessageQueue::removeIf):
+
 2009-11-19  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/JavaScriptCore/wtf/MessageQueue.h

@@ -174 +174 @@
     {
         MutexLocker lock(m_mutex);
-        DequeConstIterator<DataType*> found = m_queue.end();
-        while ((found = m_queue.findIf(predicate)) != m_queue.end()) {
+        // 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;
+
             DataType* message = *found;
             m_queue.remove(found);