[GNUnet-SVN] r20911 - gnunet/src/regex

[gnunet]

Author: szengel
Date: 2012-04-09 16:56:10 +0200 (Mon, 09 Apr 2012)
New Revision: 20911

Modified:
   gnunet/src/regex/regex.c
   gnunet/src/regex/test_regex.c
Log:
fixes


Modified: gnunet/src/regex/regex.c
===================================================================
--- gnunet/src/regex/regex.c    2012-04-07 21:35:18 UTC (rev 20910)
+++ gnunet/src/regex/regex.c    2012-04-09 14:56:10 UTC (rev 20911)
@@ -589,6 +589,9 @@
 static void
 dfa_minimize (struct GNUNET_REGEX_Automaton *a)
 {
+  if (NULL == a)
+    return;
+
   GNUNET_assert (DFA == a->type);
 
   // 1. remove unreachable states
@@ -1100,7 +1103,8 @@
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not parse regex\n");
   if (NULL != error_msg)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", error_msg);
-  GNUNET_free (p);
+  if (NULL != p)
+    GNUNET_free (p);
   while (NULL != ctx.stack_tail)
   {
     GNUNET_REGEX_automaton_destroy (ctx.stack_tail);
@@ -1163,6 +1167,13 @@
   // Create NFA
   nfa = GNUNET_REGEX_construct_nfa (regex, len);
 
+  if (NULL == nfa)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "Could not create DFA, because NFA creation failed\n");
+    return NULL;
+  }
+
   dfa = GNUNET_malloc (sizeof (struct GNUNET_REGEX_Automaton));
   dfa->type = DFA;
 

Modified: gnunet/src/regex/test_regex.c
===================================================================
--- gnunet/src/regex/test_regex.c       2012-04-07 21:35:18 UTC (rev 20910)
+++ gnunet/src/regex/test_regex.c       2012-04-09 14:56:10 UTC (rev 20911)
@@ -75,6 +75,8 @@
 
   rand_rxp = rand_rx;
   matching_strp = matching_str[0];
+  current_char = 0;
+  last_was_op = 1;
 
   // Generate random regex and a string that matches the regex
   for (i=0; i<rx_length; i++)