3 files changed, 28 insertions, 2 deletions

diff --git a/src/ats/ats_api2_transport.c b/src/ats/ats_api2_transport.c
index b8133beea..6add4baf5 100644
--- a/src/ats/ats_api2_transport.c
+++ b/src/ats/ats_api2_transport.c
@@ -190,8 +190,8 @@ static int
 check_ats_address_suggestion (void *cls,
                               const struct AddressSuggestionMessage *m)
 {
-  // FIXME: check 0-termination!
-  // FIXME: MQ API should really have a macro for this!
+  (void) cls;
+  GNUNET_MQ_check_zero_termination (m);
   return GNUNET_SYSERR;
 }
 
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 3d3a74e3b..f5f0fd701 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -501,6 +501,31 @@ struct GNUNET_MQ_MessageHandler
 
 
 /**
+ * Insert code for a "check_" function that verifies that
+ * a given variable-length message received over the network
+ * is followed by a 0-terminated string.  If the message @a m
+ * is not followed by a 0-terminated string, an error is logged
+ * and the function is returned with #GNUNET_NO.
+ *
+ * @param an IPC message with proper type to determine
+ *  the size, starting with a `struct GNUNET_MessageHeader`
+ */
+#define GNUNET_MQ_check_zero_termination(m)           \
+  {                                                   \
+    const char *str = (const char *) &m[1];           \
+    const struct GNUNET_MessageHeader *hdr =          \
+      (const struct GNUNET_MessageHeader *) m;        \
+    uint16_t slen = ntohs (hdr->size) - sizeof (*m);  \
+    if ( (0 == slen) ||                               \
+         (memchr (str, 0, slen) == &str[slen - 1]) )  \
+    {                                                 \
+      GNUNET_break (0);                               \
+      return GNUNET_NO;                               \
+    }                                                 \
+  }
+
+
+/**
  * Create a new envelope.
  *
  * @param mhp message header to store the allocated message header in, can be NULL
diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
index 0df3fd45d..552b032dd 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
+#include "gnunet_nt_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_transport_communication_service.h"