fixing common off-by-one error with respect to maximum message size

2 files changed, 3 insertions, 3 deletions

diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c
index ff8ab2e9a..b6514984d 100644
--- a/src/hostlist/hostlist-client.c
+++ b/src/hostlist/hostlist-client.c
@@ -272,7 +272,7 @@ callback_download (void *ptr,
                              size_t nmemb, 
                              void *ctx)
 {
-  static char download_buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE];
+  static char download_buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
   const char * cbuf = ptr;
   const struct GNUNET_MessageHeader *msg;
   size_t total;
@@ -295,7 +295,7 @@ callback_download (void *ptr,
   while ( (left > 0) ||
           (download_pos > 0) )
     {
-      cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - download_pos);
+      cpy = GNUNET_MIN (left, GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - download_pos);
       memcpy (&download_buffer[download_pos],
               cbuf,
               cpy);      
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 0726bf3e0..014c0f41f 100644
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -399,7 +399,7 @@ connect_handler (void *cls,
   if (hostlist_uri == NULL)
     return;
   size = strlen (hostlist_uri) + 1;
-  if (size + sizeof (struct GNUNET_MessageHeader) > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  if (size + sizeof (struct GNUNET_MessageHeader) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
     {
       GNUNET_break (0);
       return;