Fix incorrect dereferencing of char* to array's index.

feodor · feodor · commit b5b3134813a0 · 2009-01-29T16:22:10.000Z
Per Tommy Gildseth &lt;tommy.gildseth@usit.uio.no&gt; report
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.14 2009/01/01 17:23:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.15 2009/01/29 16:22:10 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -521,7 +521,7 @@ addFlagValue(IspellDict *Conf, char *s, uint32 val)
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("multibyte flag character is not allowed")));
 
-	Conf->flagval[(unsigned int) *s] = (unsigned char) val;
+	Conf->flagval[*(unsigned char*) s] = (unsigned char) val;
 	Conf->usecompound = true;
 }
 
@@ -654,7 +654,7 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 				ptr = repl + (ptr - prepl) + 1;
 				while (*ptr)
 				{
-					aflg |= Conf->flagval[(unsigned int) *ptr];
+					aflg |= Conf->flagval[*(unsigned char*) ptr];
 					ptr++;
 				}
 			}
@@ -735,7 +735,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 
 				if (*s && pg_mblen(s) == 1)
 				{
-					Conf->flagval[(unsigned int) *s] = FF_COMPOUNDFLAG;
+					Conf->flagval[*(unsigned char*) s] = FF_COMPOUNDFLAG;
 					Conf->usecompound = true;
 				}
 				oldformat = true;
@@ -791,7 +791,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
 						 errmsg("multibyte flag character is not allowed")));
 
-			flag = (unsigned char) *s;
+			flag = *(unsigned char*) s;
 			goto nextline;
 		}
 		if (STRNCMP(recoded, "COMPOUNDFLAG") == 0 || STRNCMP(recoded, "COMPOUNDMIN") == 0 ||
@@ -851,7 +851,7 @@ makeCompoundFlags(IspellDict *Conf, int affix)
 
 	while (str && *str)
 	{
-		flag |= Conf->flagval[(unsigned int) *str];
+		flag |= Conf->flagval[*(unsigned char*) str];
 		str++;
 	}
 

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/spell.c,v 1.14 2009/01/01 17:23:48 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.15 2009/01/29 16:22:10 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -521,7 +521,7 @@ addFlagValue(IspellDict Conf, char s, uint32 val)`
`521`	`521`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`522`	`522`	`errmsg("multibyte flag character is not allowed")));`
`523`	`523`
`524`		`- Conf->flagval[(unsigned int) *s] = (unsigned char) val;`
	`524`	`+ Conf->flagval[(unsigned char) s] = (unsigned char) val;`
`525`	`525`	`Conf->usecompound = true;`
`526`	`526`	`}`
`527`	`527`
`@@ -654,7 +654,7 @@ NIImportOOAffixes(IspellDict Conf, const char filename)`
`654`	`654`	`ptr = repl + (ptr - prepl) + 1;`
`655`	`655`	`while (*ptr)`
`656`	`656`	`{`
`657`		`- aflg \|= Conf->flagval[(unsigned int) *ptr];`
	`657`	`+ aflg \|= Conf->flagval[(unsigned char) ptr];`
`658`	`658`	`ptr++;`
`659`	`659`	`}`
`660`	`660`	`}`
`@@ -735,7 +735,7 @@ NIImportAffixes(IspellDict Conf, const char filename)`
`735`	`735`
`736`	`736`	`if (*s && pg_mblen(s) == 1)`
`737`	`737`	`{`
`738`		`- Conf->flagval[(unsigned int) *s] = FF_COMPOUNDFLAG;`
	`738`	`+ Conf->flagval[(unsigned char) s] = FF_COMPOUNDFLAG;`
`739`	`739`	`Conf->usecompound = true;`
`740`	`740`	`}`
`741`	`741`	`oldformat = true;`
`@@ -791,7 +791,7 @@ NIImportAffixes(IspellDict Conf, const char filename)`
`791`	`791`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`792`	`792`	`errmsg("multibyte flag character is not allowed")));`
`793`	`793`
`794`		`- flag = (unsigned char) *s;`
	`794`	`+ flag = (unsigned char) s;`
`795`	`795`	`goto nextline;`
`796`	`796`	`}`
`797`	`797`	`if (STRNCMP(recoded, "COMPOUNDFLAG") == 0 \|\| STRNCMP(recoded, "COMPOUNDMIN") == 0 \|\|`
`@@ -851,7 +851,7 @@ makeCompoundFlags(IspellDict *Conf, int affix)`
`851`	`851`
`852`	`852`	`while (str && *str)`
`853`	`853`	`{`
`854`		`- flag \|= Conf->flagval[(unsigned int) *str];`
	`854`	`+ flag \|= Conf->flagval[(unsigned char) str];`
`855`	`855`	`str++;`
`856`	`856`	`}`
`857`	`857`