From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 28 Jun 2015 13:53:42 +0000 (+0000)
Subject: fix #3693: if PA is NULL, ignore message, we must be in the wrong state
X-Git-Tag: initial-import-from-subversion-38251~1664
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a6b06943962c4978a0afb89f1eed141e142a76f;p=oweals%2Fgnunet.git

fix #3693: if PA is NULL, ignore message, we must be in the wrong state
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index a0f9e1fd7..5fe7d4e3b 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -3528,8 +3528,9 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
      now wait for the ACK to finally be connected
      - If we sent a SYN_ACK to this peer before */
 
-  if ( (GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state) &&
-       (ACK_SEND_ACK != n->ack_state))
+  if ( ( (GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state) &&
+	 (ACK_SEND_ACK != n->ack_state) ) ||
+       (NULL == n->primary_address.address) ) 
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Received unexpected ACK message from peer `%s' in state %s/%s\n",