database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Fix file descriptor leaks in pg_upgrade in failure code paths.

Browse Source
This commit is contained in:
Bruce Momjian
2011-03-08 21:35:42 -05:00
parent 51c0124481
commit d367d41d66
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/pg_upgrade/version_old_8_3.c
View File

@ -87,9 +87,11 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
PQfinish(conn);
}
if (script)
fclose(script);
if (found)
{
fclose(script);
pg_log(PG_REPORT, "fatal\n");
pg_log(PG_FATAL,
"| Your installation contains the \"name\" data type in\n"
@ -175,9 +177,11 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
PQfinish(conn);
}
if (script)
fclose(script);
if (found)
{
fclose(script);
pg_log(PG_REPORT, "fatal\n");
pg_log(PG_FATAL,
"| Your installation contains the \"tsquery\" data type.\n"
@ -314,10 +318,11 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
PQfinish(conn);
}
if (script)
fclose(script);
if (found)
{
if (!check_mode)
fclose(script);
report_status(PG_WARNING, "warning");
if (check_mode)
pg_log(PG_WARNING, "\n"
@ -424,10 +429,11 @@ old_8_3_invalidate_hash_gin_indexes(ClusterInfo *cluster, bool check_mode)
PQfinish(conn);
}
if (script)
fclose(script);
if (found)
{
if (!check_mode)
fclose(script);
report_status(PG_WARNING, "warning");
if (check_mode)
pg_log(PG_WARNING, "\n"
@ -553,10 +559,11 @@ old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster,
PQfinish(conn);
}
if (script)
fclose(script);
if (found)
{
if (!check_mode)
fclose(script);
report_status(PG_WARNING, "warning");
if (check_mode)
pg_log(PG_WARNING, "\n"
@ -672,7 +679,8 @@ old_8_3_create_sequence_script(ClusterInfo *cluster)
PQfinish(conn);
}
if (found)
if (script)
fclose(script);
check_ok();