diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-11-16 20:32:35 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-11-16 20:32:35 -0500 |
| commit | d02dbbadb7cc7a3c70803c3b77a448b355ecb85b (patch) | |
| tree | d019adcdcfa4672bf237d2fa36feac3e827660a0 | |
| parent | a39de0c415fa6f0e215c97e4d587aaa6482174ca (diff) | |
Don't Insert() a VFD entry until it's fully built.
Otherwise, if FDDEBUG is enabled, the debugging output fails because
it tries to read the fileName, which isn't set up yet (and should in
fact always be NULL).
AFAICT, this has been wrong since Berkeley. Before 96bf88d52,
it would accidentally fail to crash on platforms where snprintf()
is forgiving about being passed a NULL pointer for %s; but the
file name intended to be included in the debug output wouldn't
ever have shown up.
Report and fix by Greg Nancarrow. Although this is only visibly
broken in custom-made builds, it still seems worth back-patching
to all supported branches, as the FDDEBUG code is pretty useless
as it stands.
Discussion: https://postgr.es/m/CAJcOf-cUDgm9qYtC_B6XrC6MktMPNRby2p61EtSGZKnfotMArw@mail.gmail.com
| -rw-r--r-- | src/backend/storage/file/fd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 8cda9667957..870e5d322ac 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1165,8 +1165,6 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode) DO_DB(elog(LOG, "PathNameOpenFile: success %d", vfdP->fd)); - Insert(file); - vfdP->fileName = fnamecopy; /* Saved flags are adjusted to be OK for re-opening file */ vfdP->fileFlags = fileFlags & ~(O_CREAT | O_TRUNC | O_EXCL); @@ -1176,6 +1174,8 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode) vfdP->fdstate = 0x0; vfdP->resowner = NULL; + Insert(file); + return file; } |