diff options
| author | Tom Lane | 2017-05-07 15:34:31 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-05-07 15:35:05 +0000 |
| commit | 07987304d613be200e8e2e603e448233a344d674 (patch) | |
| tree | 757b30d8eba0a2c36089c2931430b4fbdf9e4ce9 | |
| parent | 3aa16b117a28d70790ce492435d1dfc323edb547 (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 374f76c794c..d44458ae51a 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'; } /* |