[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 14:04:46 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit cf073e12249ff10b91be2097bb4fb1b674b68732
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 3 09:22:44 2010 +0000

    2010-10-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Holger Freyther.
    
            ASSERT(m_state = Open); is bad news bears
            https://bugs.webkit.org/show_bug.cgi?id=47057
    
            Added by ap (review by darin) in http://trac.webkit.org/changeset/50951
            Too bad the compiler doesn't catch these errors.  I don't believe this
            is possible to test.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp:
            (WebCore::SocketStreamHandle::writeStreamCallback):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index efab2f2..05b9775 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Holger Freyther.
 
+        ASSERT(m_state = Open); is bad news bears
+        https://bugs.webkit.org/show_bug.cgi?id=47057
+
+        Added by ap (review by darin) in http://trac.webkit.org/changeset/50951
+        Too bad the compiler doesn't catch these errors.  I don't believe this
+        is possible to test.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::writeStreamCallback):
+
+2010-10-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Holger Freyther.
+
         All the WebSocket tests crash
         https://bugs.webkit.org/show_bug.cgi?id=47056
 
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index c66de33..a945986 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -565,7 +565,7 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
             break;
         }
 
-        ASSERT(m_state = Open);
+        ASSERT(m_state == Open);
         ASSERT(m_connectingSubstate == Connected);
 
         sendPendingData();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list