Skip to content

Guard time bucket parameter handling against bad input #9708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svenklemm wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −11
Open

Guard time bucket parameter handling against bad input #9708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions tsl/src/continuous_aggs/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,25 @@ process_additional_timebucket_parameter(ContinuousAggBucketFunction *bf, Const *
{
/* Timezone as text */
case TEXTOID:
tz_name = TextDatumGetCString(arg->constvalue);
if (!ts_is_valid_timezone_name(tz_name))
if (!arg->constisnull)
{
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid timezone name \"%s\"", tz_name)));
}
tz_name = TextDatumGetCString(arg->constvalue);
if (!ts_is_valid_timezone_name(tz_name))
{
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid timezone name \"%s\"", tz_name)));
}

bf->bucket_time_timezone = tz_name;
bf->bucket_time_timezone = tz_name;
}
break;
case INTERVALOID:
/* Bucket offset as interval */
bf->bucket_time_offset = DatumGetIntervalP(arg->constvalue);
if (!arg->constisnull)
{
bf->bucket_time_offset = DatumGetIntervalP(arg->constvalue);
}
break;
case DATEOID:
/* Bucket origin as Date */
Expand Down Expand Up @@ -258,6 +264,14 @@ process_timebucket_parameters(FuncExpr *fe, ContinuousAggBucketFunction *bf, boo
TIMESTAMP_NOBEGIN(bf->bucket_time_origin);
int nargs;

nargs = list_length(fe->args);
if (nargs < 2 || nargs > 5)
{
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unsupported time bucket function signature")));
}

/* Only column allowed : time_bucket('1day', <column> ) */
col_arg = lsecond(fe->args);

Expand Down Expand Up @@ -286,9 +300,6 @@ process_timebucket_parameters(FuncExpr *fe, ContinuousAggBucketFunction *bf, boo
return;
}

nargs = list_length(fe->args);
Assert(nargs >= 2 && nargs <= 5);

/*
* Process the third argument of the time bucket function. This could be `timezone`, `offset`,
* or `origin`.
Expand Down
Loading