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:27 -0400 |
| commit | e829385f5633c38d8a7baa3de31df537da1fe93a (patch) | |
| tree | be406f3f139b6f09990dac38d20fab09c392c88b /src/timezone/strftime.c | |
| parent | 62a2883129ab8e474ae342b7f554cf8a28eea198 (diff) | |
| download | postgresql-e829385f5633c38d8a7baa3de31df537da1fe93a.tar.gz postgresql-e829385f5633c38d8a7baa3de31df537da1fe93a.zip | |
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.
Diffstat (limited to 'src/timezone/strftime.c')
| -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 ab8f60e9c8f..2f32cf8bdb7 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) { |