提交 9a8329eb 编写于 作者: D Daniel Beck

[FIXED JENKINS-25897] Add range check for H(X-Y) syntax

上级 7f36c3f2
......@@ -110,7 +110,7 @@ throws ANTLRException
}
| ("H" "(")=> "H" "(" s=token "-" e=token ")" ( "/" d=token )?
{
bits = doHash(s,e,d);
bits = doHash(s,e,d,field);
}
| "H" ( "/" d=token )?
{
......
......@@ -96,10 +96,12 @@ abstract class BaseParser extends LLkParser {
int u = UPPER_BOUNDS[field];
if (field==2) u = 28; // day of month can vary depending on month, so to make life simpler, just use [1,28] that's always safe
if (field==4) u = 6; // Both 0 and 7 of day of week are Sunday. For better distribution, limit upper bound to 6
return doHash(LOWER_BOUNDS[field], u, step);
return doHash(LOWER_BOUNDS[field], u, step, field);
}
protected long doHash(int s, int e, int step) throws ANTLRException {
protected long doHash(int s, int e, int step, int field) throws ANTLRException {
rangeCheck(s, field);
rangeCheck(e, field);
if (step > e - s + 1) {
error(Messages.BaseParser_OutOfRange(step, 1, e - s + 1));
throw new AssertionError();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册