diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-07 12:33:12 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-07 12:33:18 -0400 |
| commit | fab2d0d7f45a5cdf0d63cf27c161f966e89ddc9e (patch) | |
| tree | 166b2c113e32bf3e7ac9f2b9d9fd15025d3a2173 | |
| parent | f754728170b7bd4624902bf0129a1c88f910ac3c (diff) | |
| download | postgresql-fab2d0d7f45a5cdf0d63cf27c161f966e89ddc9e.tar.gz | |
Guard against null t->tm_zone in strftime.c.
The upstream IANA code does not guard against null TM_ZONE pointers in this
function, but in our code there is such a check in the other pre-existing
use of t->tm_zone. We do have some places that set pg_tm.tm_zone to NULL.
I'm not entirely sure it's possible to reach strftime with such a value,
but I'm not sure it isn't either, so be safe.
Per Coverity complaint.
| -rw-r--r-- | src/timezone/strftime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c index ab8f60e9c8..2f32cf8bdb 100644 --- a/src/timezone/strftime.c +++ b/src/timezone/strftime.c @@ -459,7 +459,8 @@ _fmt(const char *format, const struct pg_tm * t, char *pt, const char *ptlim, negative = diff < 0; if (diff == 0) { - negative = t->tm_zone[0] == '-'; + if (t->tm_zone != NULL) + negative = t->tm_zone[0] == '-'; } if (negative) { |