Fix push parsing memory leak reported by Brandon Lucia at

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index f7560552af26d1441d9367f30a2c0afa998b4e8a..94f6624d7a908e93b340327eee85636236880a5c 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -340,7 +340,6 @@ compute_lookahead_tokens (void)
 static int
 state_lookahead_tokens_count (state *s)
 {
 static int
 state_lookahead_tokens_count (state *s)
 {

-  int k;

   int n_lookahead_tokens = 0;
   reductions *rp = s->reductions;
   transitions *sp = s->transitions;
   int n_lookahead_tokens = 0;
   reductions *rp = s->reductions;
   transitions *sp = s->transitions;


@@ -348,21 +347,17 @@ state_lookahead_tokens_count (state *s)
   /* We need a lookahead either to distinguish different
      reductions (i.e., there are two or more), or to distinguish a
      reduction from a shift.  Otherwise, it is straightforward,
   /* We need a lookahead either to distinguish different
      reductions (i.e., there are two or more), or to distinguish a
      reduction from a shift.  Otherwise, it is straightforward,

-     and the state is `consistent'.  */
+     and the state is `consistent'.  There is no need to check that
+     transition 0 hasn't been disabled before checking if it is a
+     shift since transitions are only disabled during conflict
+     resolution, and that hasn't happened yet.  */
+  aver (sp->num == 0 || !TRANSITION_IS_DISABLED (sp, 0));

   if (rp->num > 1
   if (rp->num > 1

-      || (rp->num == 1 && sp->num &&
-         !TRANSITION_IS_DISABLED (sp, 0) && TRANSITION_IS_SHIFT (sp, 0)))
+      || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0)))

     n_lookahead_tokens += rp->num;
   else
     s->consistent = 1;
 
     n_lookahead_tokens += rp->num;
   else
     s->consistent = 1;
 

-  for (k = 0; k < sp->num; k++)
-    if (!TRANSITION_IS_DISABLED (sp, k) && TRANSITION_IS_ERROR (sp, k))
-      {
-       s->consistent = 0;
-       break;
-      }
-

   return n_lookahead_tokens;
 }
 
   return n_lookahead_tokens;
 }
 


@@ -459,22 +454,25 @@ lalr_update_state_numbers (state_number old_to_new[], state_number nstates_old)
   goto_number ngotos_reachable = 0;
   symbol_number nonterminal = 0;
   aver (nsyms == nvars + ntokens);
   goto_number ngotos_reachable = 0;
   symbol_number nonterminal = 0;
   aver (nsyms == nvars + ntokens);

-  for (goto_number i = 0; i < ngotos; ++i)
-    {
-      while (i == goto_map[nonterminal])
-        goto_map[nonterminal++] = ngotos_reachable;
-      /* If old_to_new[from_state[i]] = nstates_old, remove this goto
-         entry.  */
-      if (old_to_new[from_state[i]] != nstates_old)
-        {
-          /* from_state[i] is not removed, so it and thus to_state[i] are
-             reachable, so to_state[i] != nstates_old.  */
-          aver (old_to_new[to_state[i]] != nstates_old);
-          from_state[ngotos_reachable] = old_to_new[from_state[i]];
-          to_state[ngotos_reachable] = old_to_new[to_state[i]];
-          ++ngotos_reachable;
-        }
-    }
+  {
+    goto_number i;
+    for (i = 0; i < ngotos; ++i)
+      {
+        while (i == goto_map[nonterminal])
+          goto_map[nonterminal++] = ngotos_reachable;
+        /* If old_to_new[from_state[i]] = nstates_old, remove this goto
+           entry.  */
+        if (old_to_new[from_state[i]] != nstates_old)
+          {
+            /* from_state[i] is not removed, so it and thus to_state[i] are
+               reachable, so to_state[i] != nstates_old.  */
+            aver (old_to_new[to_state[i]] != nstates_old);
+            from_state[ngotos_reachable] = old_to_new[from_state[i]];
+            to_state[ngotos_reachable] = old_to_new[to_state[i]];
+            ++ngotos_reachable;
+          }
+      }
+  }

   while (nonterminal <= nvars)
     {
       aver (ngotos == goto_map[nonterminal]);
   while (nonterminal <= nvars)
     {
       aver (ngotos == goto_map[nonterminal]);