NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitcf22e85

committed

Avoid platform-dependent infinite loop in pg_dump.

If malloc(0) returns NULL, the binary search in findSecLabels() willprobably go into an infinite loop when there are no security labels,because NULL-1 is greater than NULL after wraparound.(We've seen this pathology before ... I wonder whether there's a way todetect the class of bugs automatically?)Diagnosis and patch by Steve Singer, cosmetic adjustments by me

1 parent409b8c7 commitcf22e85Copy full SHA for cf22e85

File tree

1 file changed

-2

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-2

lines changed

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -645,9 +645,10 @@ main(int argc, char **argv)`
`645`	`645`	`do_sql_command(g_conn,"SET quote_all_identifiers = true");`
`646`	`646`
`647`	`647`	`/*`
`648`		`- * Disables security label support if server version < v9.1.x`
	`648`	`+ * Disable security label support if server version < v9.1.x (prevents`
	`649`	`+ * access to nonexistent pg_seclabel catalog)`
`649`	`650`	`*/`
`650`		`-if (!no_security_labels&&g_fout->remoteVersion<90100)`
	`651`	`+if (g_fout->remoteVersion<90100)`
`651`	`652`	`no_security_labels=1;`
`652`	`653`
`653`	`654`	`/*`
`@@ -11993,6 +11994,12 @@ findSecLabels(Archive fout, Oid classoid, Oid objoid, SecLabelItem *items)`
`11993`	`11994`	`if (nlabels<0)`
`11994`	`11995`	`nlabels=collectSecLabels(fout,&labels);`
`11995`	`11996`
	`11997`	`+if (nlabels <=0)/* no labels, so no match is possible */`
	`11998`	`+{`
	`11999`	`+*items=NULL;`
	`12000`	`+return0;`
	`12001`	`+}`
	`12002`	`+`
`11996`	`12003`	`/*`
`11997`	`12004`	`* Do binary search to find some item matching the object.`
`11998`	`12005`	`*/`

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!

Commitcf22e85

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dump.c`

0 commit comments