From: Kenichi Handa <handa@m17n.org>
Date: Sat, 15 Nov 2003 00:59:37 +0000 (+0000)
Subject: (skip_chars): Be sure to alloca char_ranges when necessary.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1726
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f003ca54d582625aecbef72afc416f8684e2a26b;p=emacs.git

(skip_chars): Be sure to alloca char_ranges when necessary.
---

diff --git a/src/syntax.c b/src/syntax.c
index 5b25371fcbc..57c7e4d69f2 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1418,8 +1418,6 @@ skip_chars (forwardp, string, lim)
   string_multibyte = SBYTES (string) > SCHARS (string);
 
   bzero (fastmap, sizeof fastmap);
-  if (multibyte)
-    char_ranges = (int *) alloca (SCHARS (string) * (sizeof (int)) * 2);
 
   str = SDATA (string);
   size_byte = SBYTES (string);
@@ -1502,6 +1500,7 @@ skip_chars (forwardp, string, lim)
 	  fastmap[CHAR_LEADING_CODE (c)] = 1;
 	  range_start_byte = i;
 	  range_start_char = c;
+	  char_ranges = (int *) alloca (sizeof (int) * 128 * 2);
 	  for (i = 129; i < 0400; i++)
 	    {
 	      c = unibyte_char_to_multibyte (i);
@@ -1520,8 +1519,10 @@ skip_chars (forwardp, string, lim)
 					  + range_start_char);
 	}
     }
-  else
+  else				/* STRING is multibyte */
     {
+      char_ranges = (int *) alloca (sizeof (int) * SCHARS (string) * 2);
+
       while (i_byte < size_byte)
 	{
 	  unsigned char leading_code;
@@ -1564,6 +1565,8 @@ skip_chars (forwardp, string, lim)
 		  i_byte += len;
 		}
 
+	      if (c > c2)
+		continue;
 	      if (ASCII_CHAR_P (c))
 		{
 		  while (c <= c2 && c < 0x80)