[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-767-g1f76d23

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.1-stable has been updated
       via  1f76d23c6c29d308e3ac63ec20f0ee73946ff27f (commit)
      from  b90d6abb81f54bec11305d5091532c8d5fc47a18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=1f76d23c6c29d308e3ac63ec20f0ee73946ff27f

commit 1f76d23c6c29d308e3ac63ec20f0ee73946ff27f
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Oct 28 21:32:58 2015 +0200

    Sync dfa.c with GNU grep.

diff --git a/ChangeLog b/ChangeLog
index 04dbb42..1e5b3d0 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 <address@hidden>.
 
+       Unrelated:
+       
+       * dfa.c: Sync with GNU grep.
+
 2015-10-16         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (SUBDIRS): Fix ordering so that
diff --git a/dfa.c b/dfa.c
index 188a2d5..6be2102 100644
--- a/dfa.c
+++ b/dfa.c
@@ -4189,15 +4189,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)
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    4 ++++
 dfa.c     |   20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk