From 1f76d23c6c29d308e3ac63ec20f0ee73946ff27f Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Wed, 28 Oct 2015 21:32:58 +0200 Subject: Sync dfa.c with GNU grep. --- ChangeLog | 4 ++++ dfa.c | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04dbb428..1e5b3d0e 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 . + Unrelated: + + * dfa.c: Sync with GNU grep. + 2015-10-16 Arnold D. Robbins * Makefile.am (SUBDIRS): Fix ordering so that diff --git a/dfa.c b/dfa.c index 188a2d56..6be21027 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) { -- cgit v1.2.3