Skip to content

Commit b17ce62

Browse files
gsstarkgsstark
committed
Move DTK_ISODOW DTK_DOW and DTK_DOY to be type UNITS rather than
RESERV. RESERV is meant for tokens like "now" and having them in that category throws errors like these when used as an input date: stark=# SELECT 'doy'::timestamptz; ERROR: unexpected dtype 33 while parsing timestamptz "doy" LINE 1: SELECT 'doy'::timestamptz; ^ stark=# SELECT 'dow'::timestamptz; ERROR: unexpected dtype 32 while parsing timestamptz "dow" LINE 1: SELECT 'dow'::timestamptz; ^ Found by LLVM's Libfuzzer
1 parent 74fc81e commit b17ce62

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ static const datetkn datetktbl[] = {
103103
{"d", UNITS, DTK_DAY}, /* "day of month" for ISO input */
104104
{"dec", MONTH, 12},
105105
{"december", MONTH, 12},
106-
{"dow", RESERV, DTK_DOW}, /* day of week */
107-
{"doy", RESERV, DTK_DOY}, /* day of year */
106+
{"dow", UNITS, DTK_DOW}, /* day of week */
107+
{"doy", UNITS, DTK_DOY}, /* day of year */
108108
{"dst", DTZMOD, SECS_PER_HOUR},
109109
{EPOCH, RESERV, DTK_EPOCH}, /* "epoch" reserved for system epoch time */
110110
{"feb", MONTH, 2},
@@ -114,7 +114,7 @@ static const datetkn datetktbl[] = {
114114
{"h", UNITS, DTK_HOUR}, /* "hour" */
115115
{LATE, RESERV, DTK_LATE}, /* "infinity" reserved for "late time" */
116116
{INVALID, RESERV, DTK_INVALID}, /* "invalid" reserved for bad time */
117-
{"isodow", RESERV, DTK_ISODOW}, /* ISO day of week, Sunday == 7 */
117+
{"isodow", UNITS, DTK_ISODOW}, /* ISO day of week, Sunday == 7 */
118118
{"isoyear", UNITS, DTK_ISOYEAR}, /* year in terms of the ISO week date */
119119
{"j", UNITS, DTK_JULIAN},
120120
{"jan", MONTH, 1},

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

+40-40
Original file line numberDiff line numberDiff line change
@@ -4465,6 +4465,26 @@ timestamp_part(PG_FUNCTION_ARGS)
44654465
result = date2isoyear(tm->tm_year, tm->tm_mon, tm->tm_mday);
44664466
break;
44674467

4468+
case DTK_DOW:
4469+
case DTK_ISODOW:
4470+
if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
4471+
ereport(ERROR,
4472+
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4473+
errmsg("timestamp out of range")));
4474+
result = j2day(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday));
4475+
if (val == DTK_ISODOW && result == 0)
4476+
result = 7;
4477+
break;
4478+
4479+
case DTK_DOY:
4480+
if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
4481+
ereport(ERROR,
4482+
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4483+
errmsg("timestamp out of range")));
4484+
result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday)
4485+
- date2j(tm->tm_year, 1, 1) + 1);
4486+
break;
4487+
44684488
case DTK_TZ:
44694489
case DTK_TZ_MINUTE:
44704490
case DTK_TZ_HOUR:
@@ -4488,26 +4508,6 @@ timestamp_part(PG_FUNCTION_ARGS)
44884508
#endif
44894509
break;
44904510

4491-
case DTK_DOW:
4492-
case DTK_ISODOW:
4493-
if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
4494-
ereport(ERROR,
4495-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4496-
errmsg("timestamp out of range")));
4497-
result = j2day(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday));
4498-
if (val == DTK_ISODOW && result == 0)
4499-
result = 7;
4500-
break;
4501-
4502-
case DTK_DOY:
4503-
if (timestamp2tm(timestamp, NULL, tm, &fsec, NULL, NULL) != 0)
4504-
ereport(ERROR,
4505-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4506-
errmsg("timestamp out of range")));
4507-
result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday)
4508-
- date2j(tm->tm_year, 1, 1) + 1);
4509-
break;
4510-
45114511
default:
45124512
ereport(ERROR,
45134513
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -4679,6 +4679,26 @@ timestamptz_part(PG_FUNCTION_ARGS)
46794679
result = date2isoyear(tm->tm_year, tm->tm_mon, tm->tm_mday);
46804680
break;
46814681

4682+
case DTK_DOW:
4683+
case DTK_ISODOW:
4684+
if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
4685+
ereport(ERROR,
4686+
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4687+
errmsg("timestamp out of range")));
4688+
result = j2day(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday));
4689+
if (val == DTK_ISODOW && result == 0)
4690+
result = 7;
4691+
break;
4692+
4693+
case DTK_DOY:
4694+
if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
4695+
ereport(ERROR,
4696+
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4697+
errmsg("timestamp out of range")));
4698+
result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday)
4699+
- date2j(tm->tm_year, 1, 1) + 1);
4700+
break;
4701+
46824702
default:
46834703
ereport(ERROR,
46844704
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -4700,26 +4720,6 @@ timestamptz_part(PG_FUNCTION_ARGS)
47004720
#endif
47014721
break;
47024722

4703-
case DTK_DOW:
4704-
case DTK_ISODOW:
4705-
if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
4706-
ereport(ERROR,
4707-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4708-
errmsg("timestamp out of range")));
4709-
result = j2day(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday));
4710-
if (val == DTK_ISODOW && result == 0)
4711-
result = 7;
4712-
break;
4713-
4714-
case DTK_DOY:
4715-
if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
4716-
ereport(ERROR,
4717-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
4718-
errmsg("timestamp out of range")));
4719-
result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday)
4720-
- date2j(tm->tm_year, 1, 1) + 1);
4721-
break;
4722-
47234723
default:
47244724
ereport(ERROR,
47254725
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

0 commit comments

Comments
 (0)