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

[gnunet]

Author: szengel
Date: 2012-07-05 11:46:28 +0200 (Thu, 05 Jul 2012)
New Revision: 22492

Modified:
   gnunet/src/regex/regex.c
   gnunet/src/regex/regex_graph.c
Log:
regex: fixed static analyzer warnings


Modified: gnunet/src/regex/regex.c
===================================================================
--- gnunet/src/regex/regex.c    2012-07-05 09:37:13 UTC (rev 22491)
+++ gnunet/src/regex/regex.c    2012-07-05 09:46:28 UTC (rev 22492)
@@ -1816,8 +1816,10 @@
   struct GNUNET_REGEX_Automaton *new;
 
   b = ctx->stack_tail;
+  GNUNET_assert (NULL != b);
   GNUNET_CONTAINER_DLL_remove (ctx->stack_head, ctx->stack_tail, b);
   a = ctx->stack_tail;
+  GNUNET_assert (NULL != a);
   GNUNET_CONTAINER_DLL_remove (ctx->stack_head, ctx->stack_tail, a);
 
   state_add_transition (ctx, a->end, 0, b->start);
@@ -1953,8 +1955,10 @@
   struct GNUNET_REGEX_State *end;
 
   b = ctx->stack_tail;
+  GNUNET_assert (NULL != b);
   GNUNET_CONTAINER_DLL_remove (ctx->stack_head, ctx->stack_tail, b);
   a = ctx->stack_tail;
+  GNUNET_assert (NULL != a);
   GNUNET_CONTAINER_DLL_remove (ctx->stack_head, ctx->stack_tail, a);
 
   start = nfa_state_create (ctx, 0);
@@ -2391,7 +2395,6 @@
     return 0;
 
   result = 1;
-  strp = string;
   sset = nfa_closure_create (a, a->start, 0);
 
   for (strp = string; NULL != strp && *strp; strp++)

Modified: gnunet/src/regex/regex_graph.c
===================================================================
--- gnunet/src/regex/regex_graph.c      2012-07-05 09:37:13 UTC (rev 22491)
+++ gnunet/src/regex/regex_graph.c      2012-07-05 09:46:28 UTC (rev 22492)
@@ -55,7 +55,11 @@
   for (t = v->transitions_head; NULL != t; t = t->next)
   {
     w = t->to_state;
-    if (NULL != w && w->index < 0)
+
+    if (NULL == w)
+      continue;
+    
+    if (w->index < 0)
     {
       scc_tarjan_strongconnect (scc_counter, w, index, stack, stack_size);
       v->lowlink = (v->lowlink > w->lowlink) ? w->lowlink : v->lowlink;