mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 09:51:15 +02:00
Fix query result leak during binary upgrade
9a974cbcba
moved the query in binary_upgrade_set_pg_class_oids to the outer level, but left the PQclear and query buffer destruction in the is_index conditional.353708e1fb
fixed the leak of the query buffer but left the PGresult leak. This moves clearing the result to the outer level ensuring that it will be called. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/374550C1-F4ED-4D9D-9498-0FD029CCF674@yesql.se Backpatch-through: v15
This commit is contained in:
parent
98b4f53d15
commit
a8f87d5d21
@ -5479,8 +5479,6 @@ binary_upgrade_set_pg_class_oids(Archive *fout,
|
|||||||
"SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('%u'::pg_catalog.oid);\n",
|
"SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('%u'::pg_catalog.oid);\n",
|
||||||
toast_index_relfilenumber);
|
toast_index_relfilenumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
PQclear(upgrade_res);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -5493,6 +5491,8 @@ binary_upgrade_set_pg_class_oids(Archive *fout,
|
|||||||
relfilenumber);
|
relfilenumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PQclear(upgrade_res);
|
||||||
|
|
||||||
appendPQExpBufferChar(upgrade_buffer, '\n');
|
appendPQExpBufferChar(upgrade_buffer, '\n');
|
||||||
|
|
||||||
destroyPQExpBuffer(upgrade_query);
|
destroyPQExpBuffer(upgrade_query);
|
||||||
|
Loading…
Reference in New Issue
Block a user