NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit49c279e

committed

Consistently pass an "unsigned char" to ctype.h functions.

The isxdigit() calls relied on undefined behavior. The isascii() callwas well-defined, but our prevailing style is to include the cast.Back-patch to 9.4, where the isxdigit() calls were introduced.

1 parente44964c commit49c279eCopy full SHA for 49c279e

File tree

2 files changed

-3

lines changed

contrib/pg_upgrade
- controldata.c
src/backend/utils/adt
- json.c

2 files changed

-3

lines changed

`‎contrib/pg_upgrade/controldata.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`154`	`154`	`if (GET_MAJOR_VERSION(cluster->major_version) <=803)`
`155`	`155`	`{`
`156`	`156`	`for (p=bufin;*p;p++)`
`157`		`-if (!isascii(*p))`
	`157`	`+if (!isascii((unsignedchar)*p))`
`158`	`158`	`pg_fatal("The 8.3 cluster's pg_controldata is incapable of outputting ASCII, even\n"`
`159`	`159`	`"with LANG=C. You must upgrade this cluster to a newer version of PostgreSQL\n"`
`160`	`160`	`"8.3 to fix this bug. PostgreSQL 8.3.7 and later are known to work properly.\n");`

`‎src/backend/utils/adt/json.c‎`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2353,8 +2353,11 @@ escape_json(StringInfo buf, const char *str)`
`2353`	`2353`	`* only unicode escape that should be present is \u0000,`
`2354`	`2354`	`* all the other unicode escapes will have been resolved.`
`2355`	`2355`	`*/`
`2356`		`-if (p[1]=='u'&&isxdigit(p[2])&&isxdigit(p[3])`
`2357`		`-&&isxdigit(p[4])&&isxdigit(p[5]))`
	`2356`	`+if (p[1]=='u'&&`
	`2357`	`+isxdigit((unsignedchar)p[2])&&`
	`2358`	`+isxdigit((unsignedchar)p[3])&&`
	`2359`	`+isxdigit((unsignedchar)p[4])&&`
	`2360`	`+isxdigit((unsignedchar)p[5]))`
`2358`	`2361`	`appendStringInfoCharMacro(buf,*p);`
`2359`	`2362`	`else`
`2360`	`2363`	`appendStringInfoString(buf,"\\\\");`

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!

Commit49c279e

File tree

2 files changed

2 files changed

`‎contrib/pg_upgrade/controldata.c‎`

`‎src/backend/utils/adt/json.c‎`

0 commit comments