Merge branch 'master' into feature/cmake

2 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ee2a696..15b33ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* awkgram.y (nextc): Don't allow '\0' even if check_for_bad
 	is false. Fixes a problem reported by Hanno Boeck <hanno@hboeck.de>.
 
+	Unrelated:
+	
+	* dfa.c: Sync with GNU grep.
+
 2015-10-25         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awkgram.y (yylex): Fix invalid write problems.
diff --git a/dfa.c b/dfa.c
index f3269a27..12b388d1 100644
--- a/dfa.c
+++ b/dfa.c
@@ -4177,15 +4177,17 @@ dfamust (struct dfa const *d)
           break;
         }
     }
-done:
-  if (!*result)
-    return NULL;
-
-  dm = xmalloc (sizeof *dm);
-  dm->exact = exact;
-  dm->begline = begline;
-  dm->endline = endline;
-  dm->must = xstrdup (result);
+ done:;
+
+  dm = NULL;
+  if (*result)
+    {
+      dm = xmalloc (sizeof *dm);
+      dm->exact = exact;
+      dm->begline = begline;
+      dm->endline = endline;
+      dm->must = xstrdup (result);
+    }
 
   while (mp)
     {