Commite933978

committed

In passwordFromFile, don't leak the open file after stat failures.

Oversight ine882bca. Per Coverity.

1 parentc1ff2d8 commite933978Copy full SHA for e933978

File tree

-0

lines changed

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7482,13 +7482,17 @@ passwordFromFile(const char hostname, const char port, const char *dbname,`
`7482`	`7482`
`7483`	`7483`	`#ifndefWIN32`
`7484`	`7484`	`if (fstat(fileno(fp),&stat_buf)!=0)`
	`7485`	`+{`
	`7486`	`+fclose(fp);`
`7485`	`7487`	`returnNULL;`
	`7488`	`+}`
`7486`	`7489`
`7487`	`7490`	`if (!S_ISREG(stat_buf.st_mode))`
`7488`	`7491`	`{`
`7489`	`7492`	`fprintf(stderr,`
`7490`	`7493`	`libpq_gettext("WARNING: password file \"%s\" is not a plain file\n"),`
`7491`	`7494`	`pgpassfile);`
	`7495`	`+fclose(fp);`
`7492`	`7496`	`returnNULL;`
`7493`	`7497`	`}`
`7494`	`7498`
`@@ -7498,6 +7502,7 @@ passwordFromFile(const char hostname, const char port, const char *dbname,`
`7498`	`7502`	`fprintf(stderr,`
`7499`	`7503`	`libpq_gettext("WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"),`
`7500`	`7504`	`pgpassfile);`
	`7505`	`+fclose(fp);`
`7501`	`7506`	`returnNULL;`
`7502`	`7507`	`}`
`7503`	`7508`	`#else`

Comments

(0)