Commitf175884

committed

Properly close files after read file failure to prevent potential

resource leak. Of course, any such failure aborts pg_upgrade, but mightas well be clean about it.Per patch from Grzegorz Ja?kiewicz.

1 parent112c3fc commitf175884Copy full SHA for f175884

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,10 @@ copyAndUpdateFile(migratorContext ctx, pageCnvCtx pageConverter,`
`74`	`74`	`return"can't open source file";`
`75`	`75`
`76`	`76`	`if ((dstfd=open(dst,O_RDWR \|O_CREAT \|O_EXCL,S_IRUSR \|S_IWUSR))<0)`
	`77`	`+{`
	`78`	`+fclose(src_fd);`
`77`	`79`	`return"can't create destination file";`
	`80`	`+}`
`78`	`81`
`79`	`82`	`while ((bytesRead=read(src_fd,buf,BLCKSZ))==BLCKSZ)`
`80`	`83`	`{`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,10 @@ getPageVersion(migratorContext ctx, uint16 version, const char *pathName)`
`103`	`103`	`return"can't open relation";`
`104`	`104`
`105`	`105`	`if ((bytesRead=read(relfd,&page,sizeof(page)))!=sizeof(page))`
	`106`	`+{`
	`107`	`+close(relfd);`
`106`	`108`	`return"can't read page header";`
	`109`	`+}`
`107`	`110`
`108`	`111`	`*version=PageGetPageLayoutVersion(&page);`
`109`	`112`

Comments

(0)