From 94bc1c58789440f248e65650c811abd4fd9a2886 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 18 Jan 2015 15:57:55 +0100 Subject: [PATCH] Fix use of already freed memory when dumping a database's security label. pg_dump.c:dumDatabase() called ArchiveEntry() with the results of a a query that was PQclear()ed a couple lines earlier. Backpatch to 9.2 where security labels for shared objects where introduced. --- src/bin/pg_dump/pg_dump.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 98403e7562..dcf0349e83 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -2465,25 +2465,29 @@ dumpDatabase(Archive *fout) dbCatId, 0, dbDumpId); } - PQclear(res); - /* Dump shared security label. */ if (!no_security_labels && fout->remoteVersion >= 90200) { - PQExpBuffer seclabelQry = createPQExpBuffer(); + PGresult *shres; + PQExpBuffer seclabelQry; + + seclabelQry = createPQExpBuffer(); buildShSecLabelQuery(conn, "pg_database", dbCatId.oid, seclabelQry); - res = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK); + shres = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK); resetPQExpBuffer(seclabelQry); - emitShSecLabels(conn, res, seclabelQry, "DATABASE", datname); + emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname); if (strlen(seclabelQry->data)) ArchiveEntry(fout, dbCatId, createDumpId(), datname, NULL, NULL, dba, false, "SECURITY LABEL", SECTION_NONE, seclabelQry->data, "", NULL, &dbDumpId, 1, NULL, NULL); destroyPQExpBuffer(seclabelQry); + PQclear(shres); } + PQclear(res); + destroyPQExpBuffer(dbQry); destroyPQExpBuffer(delQry); destroyPQExpBuffer(creaQry); -- 2.40.0