From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 20 Jan 2012 17:21:05 +0000 (+0000)
Subject: -fix
X-Git-Tag: initial-import-from-subversion-38251~15192
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cebfadaaefc873a8eae0d5db22173f616892ee52;p=oweals%2Fgnunet.git

-fix
---

diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index f7759a3bc..3f8d04523 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -261,7 +261,8 @@ transmit_request (void *cls,
   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 @@ transmit_request (void *cls,
   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 @@ transmit_request (void *cls,
       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);