[GNUnet-SVN] r34858 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-01-09 19:04:25 +0100 (Fri, 09 Jan 2015)
New Revision: 34858

Modified:
   gnunet/src/cadet/cadet_api.c
   gnunet/src/cadet/gnunet-service-cadet_local.c
Log:
- check minimum size, param order

Modified: gnunet/src/cadet/cadet_api.c
===================================================================
--- gnunet/src/cadet/cadet_api.c        2015-01-09 18:04:23 UTC (rev 34857)
+++ gnunet/src/cadet/cadet_api.c        2015-01-09 18:04:25 UTC (rev 34858)
@@ -1357,6 +1357,7 @@
       {
         psize += sizeof (struct GNUNET_CADET_LocalData);
         GNUNET_assert (size >= psize);
+        GNUNET_assert (sizeof (struct GNUNET_MessageHeader) <= psize);
         dmsg->header.size = htons (psize);
         dmsg->id = htonl (ch->chid);
         dmsg->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA);

Modified: gnunet/src/cadet/gnunet-service-cadet_local.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_local.c       2015-01-09 18:04:23 UTC 
(rev 34857)
+++ gnunet/src/cadet/gnunet-service-cadet_local.c       2015-01-09 18:04:25 UTC 
(rev 34858)
@@ -493,7 +493,7 @@
 
   /* Sanity check for message size */
   size = ntohs (message->size) - sizeof (struct GNUNET_CADET_LocalData);
-  if (size < sizeof (struct GNUNET_MessageHeader))
+  if (sizeof (struct GNUNET_MessageHeader) > size)
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);