NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit4d1dd8d

committed

Fix psql's copy of utf2ucs() to match the backend's copy exactly;

in particular, propagate a fix in the test to see whether a UTF8 character haslength 4 bytes. This is likely of little real-world consequence because5-or-more-byte UTF8 sequences are not supported by Postgres nor seen anywherein the wild, but still we may as well get it right. Problem found by JosephAdams.Bug is aboriginal, so back-patch all the way.

1 parent019e2f4 commit4d1dd8dCopy full SHA for 4d1dd8d

File tree

1 file changed

-10

lines changed

src/bin/psql
- mbprint.c

1 file changed

-10

lines changed

`‎src/bin/psql/mbprint.c`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.16 2005/01/01 05:43:08 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.16.4.1 2010/08/16 00:06:54 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`#include"postgres_fe.h"`
`@@ -168,28 +168,20 @@ utf2ucs(const unsigned char *c)`
`168`	`168`	`if ((*c&0x80)==0)`
`169`	`169`	`return (pg_wchar)c[0];`
`170`	`170`	`elseif ((*c&0xe0)==0xc0)`
`171`		`-{`
`172`	`171`	`return (pg_wchar) (((c[0]&0x1f) <<6) \|`
`173`	`172`	`(c[1]&0x3f));`
`174`		`-}`
`175`	`173`	`elseif ((*c&0xf0)==0xe0)`
`176`		`-{`
`177`	`174`	`return (pg_wchar) (((c[0]&0x0f) <<12) \|`
`178`	`175`	`((c[1]&0x3f) <<6) \|`
`179`	`176`	`(c[2]&0x3f));`
`180`		`-}`
`181`		`-elseif ((*c&0xf0)==0xf0)`
`182`		`-{`
	`177`	`+elseif ((*c&0xf8)==0xf0)`
`183`	`178`	`return (pg_wchar) (((c[0]&0x07) <<18) \|`
`184`	`179`	`((c[1]&0x3f) <<12) \|`
`185`	`180`	`((c[2]&0x3f) <<6) \|`
`186`	`181`	`(c[3]&0x3f));`
`187`		`-}`
`188`	`182`	`else`
`189`		`-{`
`190`	`183`	`/* that is an invalid code on purpose */`
`191`	`184`	`return0xffffffff;`
`192`		`-}`
`193`	`185`	`}`
`194`	`186`
`195`	`187`	`/* mb_utf_wcwidth : calculate column length for the utf8 string pwcs`

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!

Commit4d1dd8d

File tree

1 file changed

1 file changed

`‎src/bin/psql/mbprint.c`

0 commit comments