Update from Paul, dfainit() was call in search.c and also in dfacomp

remove the search call. grep.c file was freed twice.
Update from Paul, dfainit() was call in search.c and also in dfacomp
remove the search call. grep.c file was freed twice.

* src/grep.c (grepdir): Fix bug: memory freed twice.
* src/search.c (Gcompile, Ecompile): Don't invoke dfainit,
since dfacomp does it for us, and if we also do it then we
leak memory.

2 files changed, 2 insertions, 5 deletions

diff --git a/src/grep.c b/src/grep.c
index 7423b857..40af13d8 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -837,7 +837,8 @@ grepdir (dir, name_size)
 	  status &= grepfile (file);
 	}
       out_file -= !no_filenames;
-      free (file);
+      if (file)
+        free (file);
       free (name_space);
     }
 
diff --git a/src/search.c b/src/search.c
index 98315ef6..6d3e9432 100644
--- a/src/search.c
+++ b/src/search.c
@@ -142,8 +142,6 @@ Gcompile(pattern, size)
   if ((err = re_compile_pattern(pattern, size, &regex)) != 0)
     fatal(err, 0);
 
-  dfainit(&dfa);
-
   /* In the match_words and match_lines cases, we use a different pattern
      for the DFA matcher that will quickly throw out cases that won't work.
      Then if DFA succeeds we do some hairy stuff using the regex matcher
@@ -210,8 +208,6 @@ Ecompile(pattern, size)
   if ((err = re_compile_pattern(pattern, size, &regex)) != 0)
     fatal(err, 0);
 
-  dfainit(&dfa);
-
   /* In the match_words and match_lines cases, we use a different pattern
      for the DFA matcher that will quickly throw out cases that won't work.
      Then if DFA succeeds we do some hairy stuff using the regex matcher