diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-07 11:34:31 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-07 11:34:48 -0400 |
| commit | 38ed45c9156ac65ad35647e5c46acf2c5b03bdca (patch) | |
| tree | 65547daed42151e41b1b3aeb717cddb0b32c6825 | |
| parent | cdf5a004bb7cc78e70ffe5213049dc853b93e699 (diff) | |
Restore fullname[] contents before falling through in pg_open_tzfile().
Fix oversight in commit af2c5aa88: if the shortcut open() doesn't work,
we need to reset fullname[] to be just the name of the toplevel tzdata
directory before we fall through into the pre-existing code. This failed
to be exposed in my (tgl's) testing because the fall-through path is
actually never taken under normal circumstances.
David Rowley, per report from Amit Kapila
Discussion: https://postgr.es/m/CAA4eK1LC7CaNhRAQ__C3ht1JVrPzaAXXhEJRnR5L6bfYHiLmWw@mail.gmail.com
| -rw-r--r-- | src/timezone/pgtz.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 4de78b4efe9..2f0344ce399 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -105,6 +105,7 @@ pg_open_tzfile(const char *name, char *canonname) if (result >= 0) return result; /* If that didn't work, fall through to do it the hard way */ + fullname[fullnamelen] = '\0'; } /* |