NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit88dc6fa

committed

foreach() and list_delete() don't mix.

Fix crash when releasing duplicate entries in the encoding conversion cachelist, caused by releasing the current entry of the list being chased byforeach(). We have a standard idiom for handling such cases, but thisloop wasn't using it.This got broken in my recent rewrite of GUC assign hooks. Not sure howI missed this when testing the modified code, but I did. Per report fromPeter.

1 parentd2f60a3 commit88dc6faCopy full SHA for 88dc6fa

File tree

1 file changed

+10

-2

lines changed

src/backend/utils/mb
- mbutils.c

1 file changed

+10

-2

lines changed

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

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,8 @@ SetClientEncoding(int encoding)`
`189`	`189`	`intcurrent_server_encoding;`
`190`	`190`	`boolfound;`
`191`	`191`	`ListCell*lc;`
	`192`	`+ListCell*prev;`
	`193`	`+ListCell*next;`
`192`	`194`
`193`	`195`	`if (!PG_VALID_FE_ENCODING(encoding))`
`194`	`196`	`return-1;`
`@@ -222,10 +224,13 @@ SetClientEncoding(int encoding)`
`222`	`224`	`* leak memory.`
`223`	`225`	`*/`
`224`	`226`	`found= false;`
`225`		`-foreach(lc,ConvProcList)`
	`227`	`+prev=NULL;`
	`228`	`+for (lc=list_head(ConvProcList);lc;lc=next)`
`226`	`229`	`{`
`227`	`230`	`ConvProcInfoconvinfo= (ConvProcInfo)lfirst(lc);`
`228`	`231`
	`232`	`+next=lnext(lc);`
	`233`	`+`
`229`	`234`	`if (convinfo->s_encoding==current_server_encoding&&`
`230`	`235`	`convinfo->c_encoding==encoding)`
`231`	`236`	`{`
`@@ -240,10 +245,13 @@ SetClientEncoding(int encoding)`
`240`	`245`	`else`
`241`	`246`	`{`
`242`	`247`	`/* Duplicate entry, release it */`
`243`		`-ConvProcList=list_delete_ptr(ConvProcList,convinfo);`
	`248`	`+ConvProcList=list_delete_cell(ConvProcList,lc,prev);`
`244`	`249`	`pfree(convinfo);`
	`250`	`+continue;/* prev mustn't advance */`
`245`	`251`	`}`
`246`	`252`	`}`
	`253`	`+`
	`254`	`+prev=lc;`
`247`	`255`	`}`
`248`	`256`
`249`	`257`	`if (found)`

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!

Commit88dc6fa

File tree

1 file changed

1 file changed

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

0 commit comments