[GNUnet-SVN] r19290 - gnunet/src/vpn

[gnunet]

Author: grothoff
Date: 2012-01-20 18:21:05 +0100 (Fri, 20 Jan 2012)
New Revision: 19290

Modified:
   gnunet/src/vpn/vpn_api.c
Log:
-fix

Modified: gnunet/src/vpn/vpn_api.c
===================================================================
--- gnunet/src/vpn/vpn_api.c    2012-01-20 17:20:53 UTC (rev 19289)
+++ gnunet/src/vpn/vpn_api.c    2012-01-20 17:21:05 UTC (rev 19290)
@@ -261,7 +261,8 @@
   while ( (NULL != rr) &&
          (0 != rr->request_id) )
     rr = rr->next;
-  if (NULL == rr)
+  if ( (NULL == rr) ||
+       (0 == size) )
     return 0;
 
   /* if first request, start receive loop */
@@ -272,6 +273,7 @@
   if (NULL == rr->addr)
   {
     ret = sizeof (struct RedirectToServiceRequestMessage);
+    GNUNET_assert (ret <= size);
     rs.header.size = htons ((uint16_t) ret);
     rs.header.type = htons 
(GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE);
     rs.nac = htonl (rr->nac);
@@ -298,6 +300,7 @@
       return 0;
     }
     ret = alen + sizeof (struct RedirectToIpRequestMessage);
+    GNUNET_assert (ret <= size);
     rip.header.size = htons ((uint16_t) ret);
     rip.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP);
     rip.nac = htonl (rr->nac);