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

pg_malloc/pg_free.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index e9e9a4fe339a50bb896c7edf0e19e9d36bcc42e9..285f10c63db7b3e65eb1a277db32a693931cbfd1 100644 (file)
--- 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
index d8cd8f5b04571a16eae7719749b3e0b079586298..93ffd7b798ba07278870a192ee1242f66345d51c 100644 (file)
--- 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);