In pg_upgrade, fix a few place that used maloc/free rather than

bmomjian · bmomjian · commit 16e1ae77f9eb · 2012-11-24T22:12:39.000-05:00
pg_malloc/pg_free.
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
@@ -987,7 +987,7 @@ get_canonical_locale_name(int category, const char *locale)
 	if (!setlocale(category, save))
         pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save);
 
-	free(save);
+	pg_free(save);
 
 	return res;
 }
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -148,7 +148,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 		return -1;
 	}
 
-	buffer = (char *) malloc(COPY_BUF_SIZE);
+	buffer = (char *) pg_malloc(COPY_BUF_SIZE);
 
 	if (buffer == NULL)
 	{
@@ -171,7 +171,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 			int			save_errno = errno;
 
 			if (buffer != NULL)
-				free(buffer);
+				pg_free(buffer);
 
 			if (src_fd != 0)
 				close(src_fd);
@@ -194,7 +194,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 			int			save_errno = errno ? errno : ENOSPC;
 
 			if (buffer != NULL)
-				free(buffer);
+				pg_free(buffer);
 
 			if (src_fd != 0)
 				close(src_fd);
@@ -208,7 +208,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 	}
 
 	if (buffer != NULL)
-		free(buffer);
+		pg_free(buffer);
 
 	if (src_fd != 0)
 		close(src_fd);

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ get_canonical_locale_name(int category, const char *locale)`
`987`	`987`	`if (!setlocale(category, save))`
`988`	`988`	`pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save);`
`989`	`989`
`990`		`- free(save);`
	`990`	`+ pg_free(save);`
`991`	`991`
`992`	`992`	`return res;`
`993`	`993`	`}`