summaryrefslogtreecommitdiff
path: root/chromium/net/websockets/websocket_stream.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/websockets/websocket_stream.cc')
-rw-r--r--chromium/net/websockets/websocket_stream.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/net/websockets/websocket_stream.cc b/chromium/net/websockets/websocket_stream.cc
index ad98c833eed..899922a35e5 100644
--- a/chromium/net/websockets/websocket_stream.cc
+++ b/chromium/net/websockets/websocket_stream.cc
@@ -159,6 +159,12 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequest {
}
void PerformUpgrade() {
+ // Fail gracefully instead of crashing. TODO(bnc): Investigate and fix.
+ if (!handshake_stream_ || !connect_delegate_) {
+ ReportFailure(ERR_NOT_IMPLEMENTED);
+ return;
+ }
+
DCHECK(timer_);
DCHECK(handshake_stream_);