database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

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

Browse Source 
Per Tommy Gildseth <tommy.gildseth@usit.uio.no> report
This commit is contained in:
Teodor Sigaev 2009-01-29 16:22:10 +00:00
parent 7adbd76655
commit b5b3134813
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/tsearch/spell.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("multibyte flag character is not allowed"))); 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; Conf->usecompound = true;
} }
@ -654,7 +654,7 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
ptr = repl + (ptr - prepl) + 1; ptr = repl + (ptr - prepl) + 1;
while (*ptr) while (*ptr)
{ {
aflg |= Conf->flagval[(unsigned int) *ptr]; aflg |= Conf->flagval[*(unsigned char*) ptr];
ptr++; ptr++;
} }
} }
@ -735,7 +735,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
if (*s && pg_mblen(s) == 1) if (*s && pg_mblen(s) == 1)
{ {
Conf->flagval[(unsigned int) *s] = FF_COMPOUNDFLAG; Conf->flagval[*(unsigned char*) s] = FF_COMPOUNDFLAG;
Conf->usecompound = true; Conf->usecompound = true;
} }
oldformat = true; oldformat = true;
@ -791,7 +791,7 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("multibyte flag character is not allowed"))); errmsg("multibyte flag character is not allowed")));
flag = (unsigned char) *s; flag = *(unsigned char*) s;
goto nextline; goto nextline;
} }
if (STRNCMP(recoded, "COMPOUNDFLAG") == 0 || STRNCMP(recoded, "COMPOUNDMIN") == 0 || if (STRNCMP(recoded, "COMPOUNDFLAG") == 0 || STRNCMP(recoded, "COMPOUNDMIN") == 0 ||
@ -851,7 +851,7 @@ makeCompoundFlags(IspellDict *Conf, int affix)
while (str && *str) while (str && *str)
{ {
flag |= Conf->flagval[(unsigned int) *str]; flag |= Conf->flagval[*(unsigned char*) str];
str++; str++;
} }