diff options
| author | Tom Lane | 2017-05-07 15:34:31 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-05-07 15:34:58 +0000 |
| commit | 6eedc6c18a90ef9412a7722695edb15a3a6a09bf (patch) | |
| tree | 5f7b3444a84682cba4b0b002424752ea96d445d1 /src | |
| parent | f14bf0a8fdd5a9fb2c5be692e0c9003185b88fa3 (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
Diffstat (limited to 'src')
| -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 cdc30b3f04c..73fecb381ba 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'; } /* |