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

[abarth at webkit.org]

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

    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
    
            More code that tries to hold onto temporaries with references.
    
            * websockets/WebSocketChannel.cpp:
            (WebCore::WebSocketChannel::didOpen):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e7ed49a..efab2f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -3,6 +3,18 @@
         Reviewed by Holger Freyther.
 
         All the WebSocket tests crash
+        https://bugs.webkit.org/show_bug.cgi?id=47056
+
+        More code that tries to hold onto temporaries with references.
+
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::didOpen):
+
+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=47055
 
         This code attempts to hold onto temporary objects using references.
diff --git a/WebCore/websockets/WebSocketChannel.cpp b/WebCore/websockets/WebSocketChannel.cpp
index 5ce1cc3..7528e05 100644
--- a/WebCore/websockets/WebSocketChannel.cpp
+++ b/WebCore/websockets/WebSocketChannel.cpp
@@ -157,7 +157,7 @@ void WebSocketChannel::didOpen(SocketStreamHandle* handle)
     if (InspectorController* controller = m_context->inspectorController())
         controller->willSendWebSocketHandshakeRequest(identifier(), m_handshake.clientHandshakeRequest());
 #endif
-    const CString& handshakeMessage = m_handshake.clientHandshakeMessage();
+    CString handshakeMessage = m_handshake.clientHandshakeMessage();
     if (!handle->send(handshakeMessage.data(), handshakeMessage.length())) {
         m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Error sending handshake message.", 0, m_handshake.clientOrigin());
         handle->close();

-- 
WebKit Debian packaging