NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit082c0df

committed

Fix some wide-character bugs in the text-search parser.

In p_isdigit and other character class test functions generated by thep_iswhat macro, the code path for non-C locales with multibyte encodingscontained a bogus pointer cast that would accidentally fail to malfunctionif types wchar_t and wint_t have the same width. Apparently that is trueon most platforms, but not on recent Cygwin releases. Remove the cast,as it seems completely unnecessary (I think it arose from a false analogyto the need to cast to unsigned char when dealing with the <ctype.h>functions). Per bug #8970 from Marco Atzeri.In the same functions, the code path for C locale with a multibyte encodingsimply ANDed each wide character with 0xFF before passing it to thecorresponding <ctype.h> function. This could result in false positiveanswers for some non-ASCII characters, so use a range test instead.Noted by me while investigating Marco's complaint.Also, remove some useless though not actually buggy maskings and castsin the hand-coded p_isalnum and p_isalpha functions, which evidentlygot tested a bit more carefully than the macro-generated functions.

1 parentc8158a2 commit082c0dfCopy full SHA for 082c0df

File tree

1 file changed

+12

-8

lines changed

src/backend/tsearch
- wparser_def.c

1 file changed

+12

-8

lines changed

`‎src/backend/tsearch/wparser_def.c`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ TParserCopyClose(TParser *prs)`
`432`	`432`	`* or give wrong result.`
`433`	`433`	`*- multibyte encoding and C-locale often are used for`
`434`	`434`	`* Asian languages.`
`435`		`- *- if locale is Cthe we use pgwstr instead of wstr`
	`435`	`+ *- if locale is Cthen we use pgwstr instead of wstr.`
`436`	`436`	`*/`
`437`	`437`
`438`	`438`	`#ifdefUSE_WIDE_UPPER_LOWER`
`@@ -444,9 +444,13 @@ p_is##type(TParser *prs) {\`
`444`	`444`	`if ( prs->usewide )\`
`445`	`445`	`{\`
`446`	`446`	`if ( prs->pgwstr )\`
`447`		`-return is##type( 0xff & *( prs->pgwstr + prs->state->poschar) );\`
`448`		`-\`
`449`		`-return isw##type( (wint_t)( prs->wstr + prs->state->poschar ) );\`
	`447`	`+{\`
	`448`	`+unsigned int c = *(prs->pgwstr + prs->state->poschar);\`
	`449`	`+if ( c > 0x7f )\`
	`450`	`+return 0;\`
	`451`	`+return is##type( c );\`
	`452`	`+}\`
	`453`	`+return isw##type( *( prs->wstr + prs->state->poschar ) );\`
`450`	`454`	`}\`
`451`	`455`	`\`
`452`	`456`	`return is##type( (unsigned char)( prs->str + prs->state->posbyte ) ); \`
`@@ -475,10 +479,10 @@ p_isalnum(TParser *prs)`
`475`	`479`	`if (c>0x7f)`
`476`	`480`	`return1;`
`477`	`481`
`478`		`-returnisalnum(0xff&c);`
	`482`	`+returnisalnum(c);`
`479`	`483`	`}`
`480`	`484`
`481`		`-returniswalnum((wint_t)*(prs->wstr+prs->state->poschar));`
	`485`	`+returniswalnum(*(prs->wstr+prs->state->poschar));`
`482`	`486`	`}`
`483`	`487`
`484`	`488`	`returnisalnum((unsignedchar) (prs->str+prs->state->posbyte));`
`@@ -507,10 +511,10 @@ p_isalpha(TParser *prs)`
`507`	`511`	`if (c>0x7f)`
`508`	`512`	`return1;`
`509`	`513`
`510`		`-returnisalpha(0xff&c);`
	`514`	`+returnisalpha(c);`
`511`	`515`	`}`
`512`	`516`
`513`		`-returniswalpha((wint_t)*(prs->wstr+prs->state->poschar));`
	`517`	`+returniswalpha(*(prs->wstr+prs->state->poschar));`
`514`	`518`	`}`
`515`	`519`
`516`	`520`	`returnisalpha((unsignedchar) (prs->str+prs->state->posbyte));`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit082c0df

File tree

1 file changed

1 file changed

`‎src/backend/tsearch/wparser_def.c`

0 commit comments