[GNUnet-SVN] r25553 - in gnunet/src: nat regex

[gnunet]

Author: grothoff
Date: 2012-12-19 15:42:48 +0100 (Wed, 19 Dec 2012)
New Revision: 25553

Modified:
   gnunet/src/nat/nat_auto.c
   gnunet/src/regex/perf-regex.c
   gnunet/src/regex/test_regex_eval_api.c
Log:
-fixes

Modified: gnunet/src/nat/nat_auto.c
===================================================================
--- gnunet/src/nat/nat_auto.c   2012-12-19 14:37:53 UTC (rev 25552)
+++ gnunet/src/nat/nat_auto.c   2012-12-19 14:42:48 UTC (rev 25553)
@@ -322,8 +322,8 @@
   if (!isDefault)
     return GNUNET_OK;
   if ( (sizeof (struct sockaddr_in6) == addrlen) &&
-       (0 != memcmp (&in6addr_loopback, addr,
-                    addrlen)) &&
+       (0 != memcmp (&in6addr_loopback, &((const struct sockaddr_in6 *) 
addr)->sin6_addr,
+                    sizeof (struct in6_addr))) &&
        (! IN6_IS_ADDR_LINKLOCAL(&((const struct sockaddr_in6 *) 
addr)->sin6_addr)) )
   {
     ah->have_v6 = GNUNET_YES;

Modified: gnunet/src/regex/perf-regex.c
===================================================================
--- gnunet/src/regex/perf-regex.c       2012-12-19 14:37:53 UTC (rev 25552)
+++ gnunet/src/regex/perf-regex.c       2012-12-19 14:42:48 UTC (rev 25553)
@@ -82,9 +82,9 @@
   dfa = GNUNET_REGEX_construct_dfa (regex, size, compression);
   GNUNET_REGEX_automaton_destroy (dfa);
   GNUNET_free (buffer);
-  for (i=0;i<nr;i++)
+  for (i=0;NULL != regexes[i];i++)
     GNUNET_free_non_null (regexes[i]);
-  GNUNET_array_grow (regexes, nr, 0);
+  GNUNET_free (regexes);
   return 0;
 }
 

Modified: gnunet/src/regex/test_regex_eval_api.c
===================================================================
--- gnunet/src/regex/test_regex_eval_api.c      2012-12-19 14:37:53 UTC (rev 
25552)
+++ gnunet/src/regex/test_regex_eval_api.c      2012-12-19 14:42:48 UTC (rev 
25553)
@@ -164,6 +164,8 @@
     }
     GNUNET_free (canonical_regex);
     GNUNET_free (matching_str);
+    canonical_regex = NULL;
+    matching_str = NULL;
   }
 
   GNUNET_free (rand_rx);