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

Commit404d987

committed

Add checks for valid multibyte character length in UtfToLocal, LocalToUtf.

This back-patches commitd9f37e6 into out-of-support branches,pursuant to newly-established project policy. The point is tosuppress "uninitialized variable" warnings so that people buildingthese branches needn't expend brain cells verifying that it's safeto ignore the warnings.Discussion:https://postgr.es/m/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com

1 parentf24374b commit404d987Copy full SHA for 404d987

File tree

1 file changed

+15

-0

lines changed

src/backend/utils/mb
- conv.c

1 file changed

+15

-0

lines changed

`‎src/backend/utils/mb/conv.c`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,11 @@ UtfToLocal(const unsigned char utf, unsigned char iso,`
`382`	`382`	`iutf \|=*utf++ <<8;`
`383`	`383`	`iutf \|=*utf++;`
`384`	`384`	`}`
	`385`	`+else`
	`386`	`+{`
	`387`	`+elog(ERROR,"unsupported character length %d",l);`
	`388`	`+iutf=0;/* keep compiler quiet */`
	`389`	`+}`
`385`	`390`
`386`	`391`	`/*`
`387`	`392`	`* first, try with combined map if possible`
`@@ -437,6 +442,11 @@ UtfToLocal(const unsigned char utf, unsigned char iso,`
`437`	`442`	`iutf \|=*utf++ <<8;`
`438`	`443`	`iutf \|=*utf++;`
`439`	`444`	`}`
	`445`	`+else`
	`446`	`+{`
	`447`	`+elog(ERROR,"unsupported character length %d",l);`
	`448`	`+iutf=0;/* keep compiler quiet */`
	`449`	`+}`
`440`	`450`
`441`	`451`	`cutf[1]=iutf;`
`442`	`452`	`cp=bsearch(cutf,cmap,size2,`
`@@ -546,6 +556,11 @@ LocalToUtf(const unsigned char iso, unsigned char utf,`
`546`	`556`	`iiso \|=*iso++ <<8;`
`547`	`557`	`iiso \|=*iso++;`
`548`	`558`	`}`
	`559`	`+else`
	`560`	`+{`
	`561`	`+elog(ERROR,"unsupported character length %d",l);`
	`562`	`+iiso=0;/* keep compiler quiet */`
	`563`	`+}`
`549`	`564`
`550`	`565`	`p=bsearch(&iiso,map,size1,`
`551`	`566`	`sizeof(pg_local_to_utf),compare2);`

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!

Commit404d987

File tree

1 file changed

1 file changed

`‎src/backend/utils/mb/conv.c`

0 commit comments