Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a54d587

Browse files
committed
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.
1 parent d4e59c5 commit a54d587

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/timezone/strftime.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ _fmt(const char *format, const struct pg_tm * t, char *pt, const char *ptlim,
458458
negative = diff < 0;
459459
if (diff == 0)
460460
{
461-
negative = t->tm_zone[0] == '-';
461+
if (t->tm_zone != NULL)
462+
negative = t->tm_zone[0] == '-';
462463
}
463464
if (negative)
464465
{

0 commit comments

Comments
 (0)