Commit16e1ae7

committed

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

pg_malloc/pg_free.

1 parentbc5430a commit16e1ae7Copy full SHA for 16e1ae7

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

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`	`returnres;`
`993`	`993`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`148`	`148`	`return-1;`
`149`	`149`	`}`
`150`	`150`
`151`		`-buffer= (char*)malloc(COPY_BUF_SIZE);`
	`151`	`+buffer= (char*)pg_malloc(COPY_BUF_SIZE);`
`152`	`152`
`153`	`153`	`if (buffer==NULL)`
`154`	`154`	`{`
`@@ -171,7 +171,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`171`	`171`	`intsave_errno=errno;`
`172`	`172`
`173`	`173`	`if (buffer!=NULL)`
`174`		`-free(buffer);`
	`174`	`+pg_free(buffer);`
`175`	`175`
`176`	`176`	`if (src_fd!=0)`
`177`	`177`	`close(src_fd);`
`@@ -194,7 +194,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`194`	`194`	`intsave_errno=errno ?errno :ENOSPC;`
`195`	`195`
`196`	`196`	`if (buffer!=NULL)`
`197`		`-free(buffer);`
	`197`	`+pg_free(buffer);`
`198`	`198`
`199`	`199`	`if (src_fd!=0)`
`200`	`200`	`close(src_fd);`
`@@ -208,7 +208,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`if (buffer!=NULL)`
`211`		`-free(buffer);`
	`211`	`+pg_free(buffer);`
`212`	`212`
`213`	`213`	`if (src_fd!=0)`
`214`	`214`	`close(src_fd);`

Comments

(0)