mantis #1844

1 files changed, 9 insertions, 0 deletions

diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index 963115668..71acd1181 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -604,6 +604,10 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   alen = ntohs (hdr->size) - sizeof (struct TransportPingMessage);
   /* peer wants to confirm that this is one of our addresses, this is what is
    * used for address validation */
+
+  sig_cache = NULL;
+  sig_cache_exp = NULL;
+
   if (0 < alen)
   {
     addrend = memchr (addr, '\0', alen);
@@ -630,6 +634,11 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
   {
     addrend = NULL; /* make gcc happy */
     slen = 0;
+    static struct GNUNET_CRYPTO_RsaSignature no_address_signature;
+    static struct GNUNET_TIME_Absolute no_address_signature_expiration;
+
+    sig_cache = &no_address_signature;
+    sig_cache_exp = &no_address_signature_expiration;
   }
 
   pong = GNUNET_malloc (sizeof (struct TransportPongMessage) + alen + slen);