[GNUnet-SVN] r13976 - gnunet/src/core

[gnunet]

Author: nevans
Date: 2010-12-21 15:04:56 +0100 (Tue, 21 Dec 2010)
New Revision: 13976

Modified:
   gnunet/src/core/core_api_iterate_peers.c
Log:
possible null dereference

Modified: gnunet/src/core/core_api_iterate_peers.c
===================================================================
--- gnunet/src/core/core_api_iterate_peers.c    2010-12-21 14:03:59 UTC (rev 
13975)
+++ gnunet/src/core/core_api_iterate_peers.c    2010-12-21 14:04:56 UTC (rev 
13976)
@@ -71,10 +71,9 @@
   uint16_t msize;
 
   /* Handle last message or error case, disconnect and clean up */
-  msize = ntohs (msg->size);
   if ( (msg == NULL) ||
       ((ntohs (msg->type) == GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END) &&
-      (msize == sizeof (struct GNUNET_MessageHeader))) )
+      (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))) )
     {
       if (request_context->peer_cb != NULL)
        request_context->peer_cb (request_context->cb_cls,
@@ -84,6 +83,7 @@
       return;
     }
 
+  msize = ntohs (msg->size);
   /* Handle incorrect message type or size, disconnect and clean up */
   if ( (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT) ||
        (msize < sizeof (struct ConnectNotifyMessage)) )