Fix file descriptor leaks in pg_upgrade in failure code paths.

bmomjian · bmomjian · commit d367d41d662c · 2011-03-08T21:36:17.000-05:00
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
@@ -515,9 +515,11 @@ check_for_isn_and_int8_passing_mismatch(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 \"/contrib/isn\" functions\n"
@@ -616,9 +618,11 @@ check_for_reg_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 one of the reg* data types in\n"
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -302,15 +302,21 @@ pg_scandir_internal(const char *dirname,
 						(size_t) ((name_num + 1) * sizeof(struct dirent *)));
 
 			if (*namelist == NULL)
+			{
+				closedir(dirdesc);
 				return -1;
+			}
 
 			entrysize = sizeof(struct dirent) - sizeof(direntry->d_name) +
 				strlen(direntry->d_name) + 1;
 
 			(*namelist)[name_num] = (struct dirent *) malloc(entrysize);
 
 			if ((*namelist)[name_num] == NULL)
+			{
+				closedir(dirdesc);
 				return -1;
+			}
 
 			memcpy((*namelist)[name_num], direntry, entrysize);
 
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
@@ -144,11 +144,9 @@ get_major_server_version(ClusterInfo *cluster)
 	if (fscanf(version_fd, "%63s", cluster->major_version_str) == 0 ||
 		sscanf(cluster->major_version_str, "%d.%d", &integer_version,
 			   &fractional_version) != 2)
-	{
 		pg_log(PG_FATAL, "could not get version from %s\n", datadir);
-		fclose(version_fd);
-		return 0;
-	}
+
+	fclose(version_fd);
 
 	return (100 * integer_version + fractional_version) * 100;
 }
diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c
@@ -62,10 +62,11 @@ new_9_0_populate_pg_largeobject_metadata(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"
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -515,9 +515,11 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)`
`515`	`515`	`PQfinish(conn);`
`516`	`516`	`}`
`517`	`517`
	`518`	`+ if (script)`
	`519`	`+ fclose(script);`
	`520`	`+`
`518`	`521`	`if (found)`
`519`	`522`	`{`
`520`		`- fclose(script);`
`521`	`523`	`pg_log(PG_REPORT, "fatal\n");`
`522`	`524`	`pg_log(PG_FATAL,`
`523`	`525`	`"\| Your installation contains \"/contrib/isn\" functions\n"`
`@@ -616,9 +618,11 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)`
`616`	`618`	`PQfinish(conn);`
`617`	`619`	`}`
`618`	`620`
	`621`	`+ if (script)`
	`622`	`+ fclose(script);`
	`623`	`+`
`619`	`624`	`if (found)`
`620`	`625`	`{`
`621`		`- fclose(script);`
`622`	`626`	`pg_log(PG_REPORT, "fatal\n");`
`623`	`627`	`pg_log(PG_FATAL,`
`624`	`628`	`"\| Your installation contains one of the reg* data types in\n"`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,11 @@ new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, bool check_mode)`
`62`	`62`	`PQfinish(conn);`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ if (script)`
	`66`	`+ fclose(script);`
	`67`	`+`
`65`	`68`	`if (found)`
`66`	`69`	`{`
`67`		`- if (!check_mode)`
`68`		`- fclose(script);`
`69`	`70`	`report_status(PG_WARNING, "warning");`
`70`	`71`	`if (check_mode)`
`71`	`72`	`pg_log(PG_WARNING, "\n"`