1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Oversight in e882bcae0.  Per Coverity.
This commit is contained in:
Tom Lane 2024-09-29 13:40:03 -04:00
parent c1ff2d8bc5
commit e9339782a6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/libpq/fe-connect.c
View File

@ -7482,13 +7482,17 @@ passwordFromFile(const char *hostname, const char *port, const char *dbname,
#ifndef WIN32 #ifndef WIN32
if (fstat(fileno(fp), &stat_buf) != 0) if (fstat(fileno(fp), &stat_buf) != 0)
{
fclose(fp);
return NULL; return NULL;
}
if (!S_ISREG(stat_buf.st_mode)) if (!S_ISREG(stat_buf.st_mode))
{ {
fprintf(stderr, fprintf(stderr,
libpq_gettext("WARNING: password file \"%s\" is not a plain file\n"), libpq_gettext("WARNING: password file \"%s\" is not a plain file\n"),
pgpassfile); pgpassfile);
fclose(fp);
return NULL; return NULL;
} }
@ -7498,6 +7502,7 @@ passwordFromFile(const char *hostname, const char *port, const char *dbname,
fprintf(stderr, fprintf(stderr,
libpq_gettext("WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"), libpq_gettext("WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"),
pgpassfile); pgpassfile);
fclose(fp);
return NULL; return NULL;
} }
#else #else