Merge branch 'master' into feature/regex-to-api

2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 403967eb..e4f91a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-30         Arnold D. Robbins     <arnold@skeeve.com>
 
+	* dfa.c: Sync with fixes in GNULIB.
+
+	Unrelated:
+
 	* gawkapi.h (make_regex): New function.
 
 2016-11-29         Arnold D. Robbins     <arnold@skeeve.com>
diff --git a/dfa.c b/dfa.c
index 0a231050..ae64ba95 100644
--- a/dfa.c
+++ b/dfa.c
@@ -2652,6 +2652,12 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[])
             continue;
           if (j == CHARCLASS_WORDS)
             continue;
+
+          /* If we have reset the bit that made us declare "matched", reset
+             that indicator, too.  This is required to avoid an infinite loop
+             with this command: echo cx | LC_ALL=C grep -E 'c\b[x ]'  */
+          if (!tstbit (uc, matches))
+            matched = false;
         }
 
 #ifdef DEBUG