Bug 1271527 - Crash in mozilla::net::WebSocketChannel::Notify, r=mcmanus

2016-05-12 13:28:50 +02:00
parent b2fd1782cd
commit 5e8cb2252b
1 changed files with 1 additions and 1 deletions
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -3133,9 +3133,9 @@ WebSocketChannel::Notify(nsITimer *timer)
      LOG(("nsWebSocketChannel:: Generating Ping\n"));
      mPingOutstanding = 1;
      mPingForced = 0;
-      GeneratePing();
      mPingTimer->InitWithCallback(this, mPingResponseTimeout,
                                   nsITimer::TYPE_ONE_SHOT);
+      GeneratePing();
    } else {
      LOG(("nsWebSocketChannel:: Timed out Ping\n"));
      mPingTimer = nullptr;