Skip to content

Commit 1ba4d0f

Browse files
michaelpqmichaelpq
committed
Fix some incorrect parsing of time with time zone strings
When parsing a timetz string with a dynamic timezone abbreviation or a timezone not specified, it was possible to generate incorrect timestamps based on a date which uses some non-initialized variables if the input string did not specify fully a date to parse. This is already checked when a full timezone spec is included in the input string, but the two other cases mentioned above missed the same checks. This gets fixed by generating an error as this input is invalid, or in short when a date is not fully specified. Valgrind was complaining about this problem. Bug: #15910 Author: Alexander Lakhin Discussion: https://postgr.es/m/15910-2eba5106b9aa0c61@postgresql.org Backpatch-through: 9.4
1 parent 5b3e6c1 commit 1ba4d0f

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

‎src/backend/utils/adt/datetime.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,6 +2317,9 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
23172317
GetCurrentDateTime(tmp);
23182318
else
23192319
{
2320+
/* a date has to be specified */
2321+
if ((fmask & DTK_DATE_M) != DTK_DATE_M)
2322+
return DTERR_BAD_FORMAT;
23202323
tmp->tm_year = tm->tm_year;
23212324
tmp->tm_mon = tm->tm_mon;
23222325
tmp->tm_mday = tm->tm_mday;
@@ -2344,6 +2347,9 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
23442347
GetCurrentDateTime(tmp);
23452348
else
23462349
{
2350+
/* a date has to be specified */
2351+
if ((fmask & DTK_DATE_M) != DTK_DATE_M)
2352+
return DTERR_BAD_FORMAT;
23472353
tmp->tm_year = tm->tm_year;
23482354
tmp->tm_mon = tm->tm_mon;
23492355
tmp->tm_mday = tm->tm_mday;

‎src/test/regress/expected/timetz.out

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ INSERT INTO TIMETZ_TBL VALUES ('15:36:39 America/New_York');
1919
ERROR: invalid input syntax for type time with time zone: "15:36:39 America/New_York"
2020
LINE 1: INSERT INTO TIMETZ_TBL VALUES ('15:36:39 America/New_York');
2121
^
22+
-- this should fail (timezone not specified without a date)
23+
INSERT INTO TIMETZ_TBL VALUES ('15:36:39 m2');
24+
ERROR: invalid input syntax for type time with time zone: "15:36:39 m2"
25+
LINE 1: INSERT INTO TIMETZ_TBL VALUES ('15:36:39 m2');
26+
^
27+
-- this should fail (dynamic timezone abbreviation without a date)
28+
INSERT INTO TIMETZ_TBL VALUES ('15:36:39 MSK m2');
29+
ERROR: invalid input syntax for type time with time zone: "15:36:39 MSK m2"
30+
LINE 1: INSERT INTO TIMETZ_TBL VALUES ('15:36:39 MSK m2');
31+
^
2232
SELECT f1 AS "Time TZ" FROM TIMETZ_TBL;
2333
Time TZ
2434
----------------

‎src/test/regress/sql/timetz.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ INSERT INTO TIMETZ_TBL VALUES ('2003-03-07 15:36:39 America/New_York');
1919
INSERT INTO TIMETZ_TBL VALUES ('2003-07-07 15:36:39 America/New_York');
2020
-- this should fail (the timezone offset is not known)
2121
INSERT INTO TIMETZ_TBL VALUES ('15:36:39 America/New_York');
22+
-- this should fail (timezone not specified without a date)
23+
INSERT INTO TIMETZ_TBL VALUES ('15:36:39 m2');
24+
-- this should fail (dynamic timezone abbreviation without a date)
25+
INSERT INTO TIMETZ_TBL VALUES ('15:36:39 MSK m2');
26+
2227

2328
SELECT f1 AS "Time TZ" FROM TIMETZ_TBL;
2429

0 commit comments

Comments
 (0)