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

[gnunet]

Author: wachs
Date: 2012-02-01 15:59:30 +0100 (Wed, 01 Feb 2012)
New Revision: 19597

Modified:
   gnunet/src/transport/transport_api_blacklist.c
Log:
fix 2 crashes in blacklisting api
- client transmit handle was not sent to NULL after sending
- BlacklistMessage was not checked for NULL


Modified: gnunet/src/transport/transport_api_blacklist.c
===================================================================
--- gnunet/src/transport/transport_api_blacklist.c      2012-02-01 13:26:01 UTC 
(rev 19596)
+++ gnunet/src/transport/transport_api_blacklist.c      2012-02-01 14:59:30 UTC 
(rev 19597)
@@ -103,7 +103,9 @@
   struct GNUNET_TRANSPORT_Blacklist *br = cls;
   const struct BlacklistMessage *bm;
 
-  if ((ntohs (msg->size) != sizeof (struct BlacklistMessage)) ||
+  GNUNET_assert (br != NULL);
+  if ((NULL == msg) ||
+      (ntohs (msg->size) != sizeof (struct BlacklistMessage)) ||
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY))
   {
     reconnect (br);
@@ -151,6 +153,7 @@
   req.size = htons (sizeof (struct GNUNET_MessageHeader));
   req.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT);
   memcpy (buf, &req, sizeof (req));
+  br->th = NULL;
   receive (br);
   return sizeof (req);
 }
@@ -201,6 +204,7 @@
   req.is_allowed = htonl (br->cb (br->cb_cls, &br->peer));
   req.peer = br->peer;
   memcpy (buf, &req, sizeof (req));
+  br->th = NULL;
   receive (br);
   return sizeof (req);
 }