[GNUnet-SVN] r22906 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-07-25 14:10:20 +0200 (Wed, 25 Jul 2012)
New Revision: 22906

Modified:
   gnunet/src/transport/gnunet-service-transport_validation.c
Log:
- coverity 10070


Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c  2012-07-25 
11:53:56 UTC (rev 22905)
+++ gnunet/src/transport/gnunet-service-transport_validation.c  2012-07-25 
12:10:20 UTC (rev 22906)
@@ -819,7 +819,7 @@
   sig_cache = NULL;
   sig_cache_exp = NULL;
 
-  if (0 < alen)
+  if (alen > 0)
   {
     addrend = memchr (addr, '\0', alen);
     if (NULL == addrend)
@@ -890,6 +890,9 @@
              GNUNET_h2s (&GST_my_identity.hashPubKey),
               GNUNET_i2s (sender));
 
+  /* message with structure:
+   * [TransportPongMessage][Transport name][Address] */
+
   pong = GNUNET_malloc (sizeof (struct TransportPongMessage) + alen + slen);
   pong->header.size =
       htons (sizeof (struct TransportPongMessage) + alen + slen);
@@ -931,7 +934,11 @@
   else
   {
 #endif
-    memcpy (&((char *) &pong[1])[slen], addrend, alen);
+    if (alen > 0)
+    {
+        GNUNET_assert (NULL != addrend);
+        memcpy (&((char *) &pong[1])[slen], addrend, alen);
+    }
     if (GNUNET_TIME_absolute_get_remaining (*sig_cache_exp).rel_value <
         PONG_SIGNATURE_LIFETIME.rel_value / 4)
     {
@@ -1101,6 +1108,9 @@
                             gettext_noop ("# PONG messages received"), 1,
                             GNUNET_NO);
 
+  /* message with structure:
+   * [TransportPongMessage][Transport name][Address] */
+
   pong = (const struct TransportPongMessage *) hdr;
   tname = (const char *) &pong[1];
   size = ntohs (hdr->size) - sizeof (struct TransportPongMessage);