Guard against null t->tm_zone in strftime.c.
authorTom Lane
Sun, 7 May 2017 16:33:12 +0000 (12:33 -0400)
committerTom Lane
Sun, 7 May 2017 16:33:18 +0000 (12:33 -0400)
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.

src/timezone/strftime.c

index ab8f60e9c8f36bbcff74e8653c4de6c9b4e96626..2f32cf8bdb7a65447dea97f2d066c8d0baf37d74 100644 (file)
@@ -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)
                        {