diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-20 17:21:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-20 17:21:05 +0000 |
commit | cebfadaaefc873a8eae0d5db22173f616892ee52 (patch) | |
tree | e9b443e8cc6257f671fb179dc62500f082e3721e /src/vpn/vpn_api.c | |
parent | 219eba94d0b3b946c150ecd2e71d4ceecb887d0d (diff) | |
download | gnunet-cebfadaaefc873a8eae0d5db22173f616892ee52.tar.gz gnunet-cebfadaaefc873a8eae0d5db22173f616892ee52.zip |
-fix
Diffstat (limited to 'src/vpn/vpn_api.c')
-rw-r--r-- | src/vpn/vpn_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, | |||
261 | while ( (NULL != rr) && | 261 | while ( (NULL != rr) && |
262 | (0 != rr->request_id) ) | 262 | (0 != rr->request_id) ) |
263 | rr = rr->next; | 263 | rr = rr->next; |
264 | if (NULL == rr) | 264 | if ( (NULL == rr) || |
265 | (0 == size) ) | ||
265 | return 0; | 266 | return 0; |
266 | 267 | ||
267 | /* if first request, start receive loop */ | 268 | /* if first request, start receive loop */ |
@@ -272,6 +273,7 @@ transmit_request (void *cls, | |||
272 | if (NULL == rr->addr) | 273 | if (NULL == rr->addr) |
273 | { | 274 | { |
274 | ret = sizeof (struct RedirectToServiceRequestMessage); | 275 | ret = sizeof (struct RedirectToServiceRequestMessage); |
276 | GNUNET_assert (ret <= size); | ||
275 | rs.header.size = htons ((uint16_t) ret); | 277 | rs.header.size = htons ((uint16_t) ret); |
276 | rs.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE); | 278 | rs.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE); |
277 | rs.nac = htonl (rr->nac); | 279 | rs.nac = htonl (rr->nac); |
@@ -298,6 +300,7 @@ transmit_request (void *cls, | |||
298 | return 0; | 300 | return 0; |
299 | } | 301 | } |
300 | ret = alen + sizeof (struct RedirectToIpRequestMessage); | 302 | ret = alen + sizeof (struct RedirectToIpRequestMessage); |
303 | GNUNET_assert (ret <= size); | ||
301 | rip.header.size = htons ((uint16_t) ret); | 304 | rip.header.size = htons ((uint16_t) ret); |
302 | rip.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP); | 305 | rip.header.type = htons (GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP); |
303 | rip.nac = htonl (rr->nac); | 306 | rip.nac = htonl (rr->nac); |