-fix misc issues

2 files changed, 26 insertions, 12 deletions

diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 2114e2cb1..c5ecf3b4d 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -1231,41 +1231,55 @@ load_search_strings (const char *filename,
                 "Could not find search strings file %s\n", filename);
     return GNUNET_SYSERR;
   }
-  if (GNUNET_OK != GNUNET_DISK_file_size (filename, &filesize, GNUNET_YES, GNUNET_YES))
+  if (GNUNET_OK !=
+      GNUNET_DISK_file_size (filename,
+                             &filesize,
+                             GNUNET_YES,
+                             GNUNET_YES))
     filesize = 0;
   if (0 == filesize)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Search strings file %s is empty.\n", filename);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Search strings file %s is empty.\n",
+                filename);
     return GNUNET_SYSERR;
   }
-  data = GNUNET_malloc (filesize);
-  if (filesize != GNUNET_DISK_fn_read (filename, data, filesize))
+  data = GNUNET_malloc (filesize + 1);
+  if (filesize != GNUNET_DISK_fn_read (filename,
+                                       data,
+                                       filesize))
   {
     GNUNET_free (data);
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read search strings file %s.\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Could not read search strings file %s.\n",
          filename);
     return GNUNET_SYSERR;
   }
   buf = data;
   offset = 0;
   str_cnt = 0;
-  while (offset < (filesize - 1) && str_cnt < limit)
+  while ( (offset < (filesize - 1)) && (str_cnt < limit) )
   {
     offset++;
-    if (((data[offset] == '\n')) && (buf != &data[offset]))
+    if ( ((data[offset] == '\n')) &&
+         (buf != &data[offset]) )
     {
       data[offset] = '\0';
       str_cnt++;
       buf = &data[offset + 1];
     }
-    else if ((data[offset] == '\n') || (data[offset] == '\0'))
+    else if ( (data[offset] == '\n') ||
+              (data[offset] == '\0') )
       buf = &data[offset + 1];
   }
   *strings = GNUNET_malloc (sizeof (char *) * str_cnt);
   offset = 0;
   for (i = 0; i < str_cnt; i++)
   {
-    GNUNET_asprintf (&(*strings)[i], "%s%s", regex_prefix, &data[offset]);
+    GNUNET_asprintf (&(*strings)[i],
+                     "%s%s",
+                     regex_prefix,
+                     &data[offset]);
     offset += strlen (&data[offset]) + 1;
   }
   GNUNET_free (data);
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 616b7f141..cb78545b9 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -2037,9 +2037,9 @@ dfa_merge_nondistinguishable_states (struct REGEX_INTERNAL_Context *ctx,
               /* same edge, but targets definitively different, so we're different
                  as well */
               if (t1->to_state->marked > t2->to_state->marked)
-                idx1 = t1->to_state->marked * state_cnt + t2->to_state->marked;
+                idx1 = (unsigned long long) t1->to_state->marked * state_cnt + t2->to_state->marked;
               else
-                idx1 = t2->to_state->marked * state_cnt + t1->to_state->marked;
+                idx1 = (unsigned long long) t2->to_state->marked * state_cnt + t1->to_state->marked;
               if (0 != (table[idx1 / 32] & (1 << (idx1 % 32))))
               {
                 table[idx / 32] |= (1 << (idx % 32));
@@ -2066,7 +2066,7 @@ dfa_merge_nondistinguishable_states (struct REGEX_INTERNAL_Context *ctx,
     for (s2 = a->states_head; NULL != s2 && s1 != s2; s2 = s2_next)
     {
       s2_next = s2->next;
-      idx = s1->marked * state_cnt + s2->marked;
+      idx = (unsigned long long) s1->marked * state_cnt + s2->marked;
       if (0 == (table[idx / 32] & (1 << (idx % 32))))
         automaton_merge_states (ctx, a, s1, s2);
     }