* src/search.c (boyer_moore): Take unibyte characters from pattern

literally. (Bug#9458)

* src/search.c (boyer_moore): Take unibyte characters from pattern
literally. (Bug#9458)
edb7b4dc · Andreas Schwab · 6e20a0d4 · edb7b4dc · edb7b4dc
Commit edb7b4dc authored Sep 07, 2011 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/search.c src/search.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2011-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* search.c (boyer_moore): Take unibyte characters from pattern
+	literally.  (Bug#9458)
+
 2011-08-30  Chong Yidong  <cyd@stupidchicken.com>
  
 	* syntax.c (find_defun_start): Update all cache variables if

--- a/src/search.c
+++ b/src/search.c
@@ -1837,7 +1837,7 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
 		ch = -1;
 	    }

-	  if (ch >= 0200)
+	  if (ch >= 0200 && multibyte)
 	    j = (ch & 0x3F) | 0200;
 	  else
 	    j = *ptr;
@@ -1856,7 +1856,7 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
 	      while (1)
 		{
 		  TRANSLATE (ch, inverse_trt, ch);
-		  if (ch >= 0200)
+		  if (ch >= 0200 && multibyte)
 		    j = (ch & 0x3F) | 0200;
 		  else
 		    j = ch;