1 files changed, 5 insertions, 3 deletions

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 8b3e849b2..93cd7eab4 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -281,6 +281,7 @@ process_ats_message (void *cls,
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
+  uint16_t plugin_name_length;
   uint32_t ats_count;
 
   if (NULL == msg) 
@@ -305,12 +306,13 @@ process_ats_message (void *cls,
   atsi = (const struct GNUNET_TRANSPORT_ATS_Information*) &m[1];
   address = (const char*) &atsi[ats_count];
   plugin_name = &address[address_length];
-  if ( (ntohs (m->address_length) +
-        ntohs (m->plugin_name_length) +
+  plugin_name_length = ntohs (m->plugin_name_length);
+  if ( (address_length +
+        plugin_name_length +
         ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
         sizeof (struct AddressSuggestionMessage) != ntohs (msg->size))  ||
        (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
-       (plugin_name[ntohs (m->plugin_name_length) - 1] != '\0') )
+       (plugin_name[plugin_name_length - 1] != '\0') )
   {
     GNUNET_break (0);
     GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO);