Title: [150991] trunk/Source/WebCore
- Revision
- 150991
- Author
- rafael.l...@openbossa.org
- Date
- 2013-05-30 16:15:36 -0700 (Thu, 30 May 2013)
Log Message
Fix double hash lookup in WebSocket::connect loop
https://bugs.webkit.org/show_bug.cgi?id=117052
Reviewed by Anders Carlsson.
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::connect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150990 => 150991)
--- trunk/Source/WebCore/ChangeLog 2013-05-30 22:58:12 UTC (rev 150990)
+++ trunk/Source/WebCore/ChangeLog 2013-05-30 23:15:36 UTC (rev 150991)
@@ -1,3 +1,13 @@
+2013-05-30 Rafael Brandao <rafael.l...@openbossa.org>
+
+ Fix double hash lookup in WebSocket::connect loop
+ https://bugs.webkit.org/show_bug.cgi?id=117052
+
+ Reviewed by Anders Carlsson.
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::connect):
+
2013-05-30 Benjamin Poulain <bpoul...@apple.com>
Remove some 16bits conversion.
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (150990 => 150991)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2013-05-30 22:58:12 UTC (rev 150990)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2013-05-30 23:15:36 UTC (rev 150991)
@@ -274,13 +274,12 @@
}
HashSet<String> visited;
for (size_t i = 0; i < protocols.size(); ++i) {
- if (visited.contains(protocols[i])) {
+ if (!visited.add(protocols[i]).isNewEntry) {
scriptExecutionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "WebSocket protocols contain duplicates: '" + encodeProtocolString(protocols[i]) + "'");
m_state = CLOSED;
ec = SYNTAX_ERR;
return;
}
- visited.add(protocols[i]);
}
String protocolString;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
