Fix multibyte character problem with brackets in dfa.c.

2 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ea96384d..33f2d317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c (copytoks): Rewrite to call addtok_mb() directly. Avoids
+	problems with multibyte characters inside character sets.
+	Thanks to Steven Daniels <stevendaniels88@gmail.com> for reporting
+	the problem.  Much thanks to Mike Haertel <mike@ducky.net> for the
+	analysis and fix.
+
 2013-06-24  Eli Zaretskii  <eliz@gnu.org>
 
 	* io.c: Move #include "popen.h" out of the HAVE_SOCKETS condition,
diff --git a/dfa.c b/dfa.c
index 54e0ae9d..2195e281 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1847,13 +1847,12 @@ copytoks (size_t tindex, size_t ntokens)
 {
   size_t i;
 
-  for (i = 0; i < ntokens; ++i)
-    {
-      addtok (dfa->tokens[tindex + i]);
-      /* Update index into multibyte csets.  */
-      if (MB_CUR_MAX > 1 && dfa->tokens[tindex + i] == MBCSET)
-        dfa->multibyte_prop[dfa->tindex - 1] = dfa->multibyte_prop[tindex + i];
-    }
+  if (MB_CUR_MAX > 1)
+    for (i = 0; i < ntokens; ++i)
+      addtok_mb(dfa->tokens[tindex + i], dfa->multibyte_prop[tindex + i]);
+  else
+    for (i = 0; i < ntokens; ++i)
+      addtok_mb(dfa->tokens[tindex + i], 3);
 }
 
 static void