NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit94bc1c5

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 parent6bbf751 commit94bc1c5Copy full SHA for 94bc1c5

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
`@@ -2465,25 +2465,29 @@ dumpDatabase(Archive *fout)`
`2465`	`2465`	`dbCatId,0,dbDumpId);`
`2466`	`2466`	`}`
`2467`	`2467`
`2468`		`-PQclear(res);`
`2469`		`-`
`2470`	`2468`	`/* Dump shared security label. */`
`2471`	`2469`	`if (!no_security_labels&&fout->remoteVersion >=90200)`
`2472`	`2470`	`{`
`2473`		`-PQExpBufferseclabelQry=createPQExpBuffer();`
	`2471`	`+PGresult*shres;`
	`2472`	`+PQExpBufferseclabelQry;`
	`2473`	`+`
	`2474`	`+seclabelQry=createPQExpBuffer();`
`2474`	`2475`
`2475`	`2476`	`buildShSecLabelQuery(conn,"pg_database",dbCatId.oid,seclabelQry);`
`2476`		`-res=ExecuteSqlQuery(fout,seclabelQry->data,PGRES_TUPLES_OK);`
	`2477`	`+shres=ExecuteSqlQuery(fout,seclabelQry->data,PGRES_TUPLES_OK);`
`2477`	`2478`	`resetPQExpBuffer(seclabelQry);`
`2478`		`-emitShSecLabels(conn,res,seclabelQry,"DATABASE",datname);`
	`2479`	`+emitShSecLabels(conn,shres,seclabelQry,"DATABASE",datname);`
`2479`	`2480`	`if (strlen(seclabelQry->data))`
`2480`	`2481`	`ArchiveEntry(fout,dbCatId,createDumpId(),datname,NULL,NULL,`
`2481`	`2482`	`dba, false,"SECURITY LABEL",SECTION_NONE,`
`2482`	`2483`	`seclabelQry->data,"",NULL,`
`2483`	`2484`	`&dbDumpId,1,NULL,NULL);`
`2484`	`2485`	`destroyPQExpBuffer(seclabelQry);`
	`2486`	`+PQclear(shres);`
`2485`	`2487`	`}`
`2486`	`2488`
	`2489`	`+PQclear(res);`
	`2490`	`+`
`2487`	`2491`	`destroyPQExpBuffer(dbQry);`
`2488`	`2492`	`destroyPQExpBuffer(delQry);`
`2489`	`2493`	`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!

Commit94bc1c5

File tree

1 file changed

1 file changed

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

0 commit comments