Fix a few places that were non-multibyte-safe in tsearch configuration file

tglsfdc · tglsfdc · commit 30dc388a0dd9 · 2008-06-19T16:52:24.000Z
parsing.  Per bug #4253 from Giorgio Valoti.
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.12 2008/06/18 20:55:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.13 2008/06/19 16:52:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -509,7 +509,7 @@ static void
 addFlagValue(IspellDict *Conf, char *s, uint32 val)
 {
 	while (*s && t_isspace(s))
-		s++;
+		s += pg_mblen(s);
 
 	if (!*s)
 		ereport(ERROR,
@@ -595,7 +595,7 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 			char	   *s = recoded + strlen("FLAG");
 
 			while (*s && t_isspace(s))
-				s++;
+				s += pg_mblen(s);
 
 			if (*s && STRNCMP(s, "default") != 0)
 				ereport(ERROR,
@@ -729,9 +729,9 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 				s = recoded + (s - pstr);		/* we need non-lowercased
 												 * string */
 				while (*s && !t_isspace(s))
-					s++;
+					s += pg_mblen(s);
 				while (*s && t_isspace(s))
-					s++;
+					s += pg_mblen(s);
 
 				if (*s && pg_mblen(s) == 1)
 				{
@@ -762,7 +762,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 			flagflags = 0;
 
 			while (*s && t_isspace(s))
-				s++;
+				s += pg_mblen(s);
 			oldformat = true;
 
 			/* allow only single-encoded flags */
diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.11 2008/06/18 20:55:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.12 2008/06/19 16:52:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *))
 
 			/* Trim trailing space */
 			while (*pbuf && !t_isspace(pbuf))
-				pbuf++;
+				pbuf += pg_mblen(pbuf);
 			*pbuf = '\0';
 
 			/* Skip empty lines */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.11 2008/06/18 20:55:42 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.12 2008/06/19 16:52:24 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -97,7 +97,7 @@ readstoplist(const char fname, StopList s, char (wordop) (const char *))`
`97`	`97`
`98`	`98`	`/* Trim trailing space */`
`99`	`99`	`while (*pbuf && !t_isspace(pbuf))`
`100`		`- pbuf++;`
	`100`	`+ pbuf += pg_mblen(pbuf);`
`101`	`101`	`*pbuf = '\0';`
`102`	`102`
`103`	`103`	`/* Skip empty lines */`