From: Tom Lane Date: Sun, 7 May 2017 15:34:31 +0000 (-0400) Subject: Restore fullname[] contents before falling through in pg_open_tzfile(). X-Git-Tag: REL9_2_21~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9061680f06b06588281bdc8e59106eb33726360f;p=postgresql 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 --- diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index b3ed4df143..964c308937 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'; } /*