Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/tools/quic/chlo_extractor.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/chlo_extractor.h"
 
 #include "net/quic/core/crypto/crypto_framer.h"
 #include "net/quic/core/crypto/crypto_handshake_message.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
@@ skipping 130 matching lines @@
 }
 
 bool ChloFramerVisitor::OnPaddingFrame(const QuicPaddingFrame& frame) {
   return true;
 }
 
 void ChloFramerVisitor::OnError(CryptoFramer* framer) {}
 
 void ChloFramerVisitor::OnHandshakeMessage(
     const CryptoHandshakeMessage& message) {
-  delegate_->OnChlo(framer_->version(), connection_id_, message);
+  if (delegate_ != nullptr) {
+    delegate_->OnChlo(framer_->version(), connection_id_, message);
+  }
   found_chlo_ = true;
 }
 
 }  // namespace
 
 // static
 bool ChloExtractor::Extract(const QuicEncryptedPacket& packet,
                             const QuicVersionVector& versions,
                             Delegate* delegate) {
   QuicFramer framer(versions, QuicTime::Zero(), Perspective::IS_SERVER);
   ChloFramerVisitor visitor(&framer, delegate);
   framer.set_visitor(&visitor);
   if (!framer.ProcessPacket(packet)) {
     return false;
   }
   return visitor.found_chlo();
 }
 
 }  // namespace net