NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit821386a

committed

Fix use of already freed memory when dumping a database's security label.

pg_dump.c:dumDatabase() called ArchiveEntry() with the results of a aquery that was PQclear()ed a couple lines earlier.Backpatch to 9.2 where security labels for shared objects whereintroduced.

1 parentc8ef5b1 commit821386aCopy full SHA for 821386a

File tree

1 file changed

-5

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-5

lines changed

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

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2112,25 +2112,29 @@ dumpDatabase(Archive *fout)`
`2112`	`2112`	`dbCatId,0,dbDumpId);`
`2113`	`2113`	`}`
`2114`	`2114`
`2115`		`-PQclear(res);`
`2116`		`-`
`2117`	`2115`	`/* Dump shared security label. */`
`2118`	`2116`	`if (!no_security_labels&&fout->remoteVersion >=90200)`
`2119`	`2117`	`{`
`2120`		`-PQExpBufferseclabelQry=createPQExpBuffer();`
	`2118`	`+PGresult*shres;`
	`2119`	`+PQExpBufferseclabelQry;`
	`2120`	`+`
	`2121`	`+seclabelQry=createPQExpBuffer();`
`2121`	`2122`
`2122`	`2123`	`buildShSecLabelQuery(conn,"pg_database",dbCatId.oid,seclabelQry);`
`2123`		`-res=ExecuteSqlQuery(fout,seclabelQry->data,PGRES_TUPLES_OK);`
	`2124`	`+shres=ExecuteSqlQuery(fout,seclabelQry->data,PGRES_TUPLES_OK);`
`2124`	`2125`	`resetPQExpBuffer(seclabelQry);`
`2125`		`-emitShSecLabels(conn,res,seclabelQry,"DATABASE",datname);`
	`2126`	`+emitShSecLabels(conn,shres,seclabelQry,"DATABASE",datname);`
`2126`	`2127`	`if (strlen(seclabelQry->data))`
`2127`	`2128`	`ArchiveEntry(fout,dbCatId,createDumpId(),datname,NULL,NULL,`
`2128`	`2129`	`dba, false,"SECURITY LABEL",SECTION_NONE,`
`2129`	`2130`	`seclabelQry->data,"",NULL,`
`2130`	`2131`	`&dbDumpId,1,NULL,NULL);`
`2131`	`2132`	`destroyPQExpBuffer(seclabelQry);`
	`2133`	`+PQclear(shres);`
`2132`	`2134`	`}`
`2133`	`2135`
	`2136`	`+PQclear(res);`
	`2137`	`+`
`2134`	`2138`	`destroyPQExpBuffer(dbQry);`
`2135`	`2139`	`destroyPQExpBuffer(delQry);`
`2136`	`2140`	`destroyPQExpBuffer(creaQry);`

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!

Commit821386a

File tree

1 file changed

1 file changed

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

0 commit comments