[trafficserver] branch quic-latest updated: Fix nullptr dereference

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/quic-latest by this push:
     new 4b3d127  Fix nullptr dereference
4b3d127 is described below

commit 4b3d12790c5866abe2eba0772bb9441a0aec8e6f
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Thu May 17 11:29:16 2018 +0900

    Fix nullptr dereference
---
 iocore/net/QUICNetVConnection.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index d0f6bef..5b03dcb 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -1404,18 +1404,18 @@ QUICNetVConnection::_dequeue_recv_packet(QUICPacketCreationResult &result)
 {
   QUICPacketUPtr packet = this->_packet_recv_queue.dequeue(result);
 
-  if (this->direction() == NET_VCONNECTION_OUT) {
-    // Reset CID if a server sent back a new CID
-    // FIXME This should happen only once
-    QUICConnectionId cid = packet->destination_cid();
-    if (cid.length()) {
-      if (this->_quic_connection_id != cid) {
-        this->_quic_connection_id = cid;
+  if (result == QUICPacketCreationResult::SUCCESS) {
+    if (this->direction() == NET_VCONNECTION_OUT) {
+      // Reset CID if a server sent back a new CID
+      // FIXME This should happen only once
+      QUICConnectionId cid = packet->destination_cid();
+      if (cid.length()) {
+        if (this->_quic_connection_id != cid) {
+          this->_quic_connection_id = cid;
+        }
       }
     }
-  }
 
-  if (result == QUICPacketCreationResult::SUCCESS) {
     this->_last_received_packet_type = packet->type();
     this->_packet_factory.set_dcil(packet->destination_cid().length());
   }

-- 
To stop receiving notification emails like this one, please contact
masaori@apache.org.