Skip to content

fix off-by-one range clamp in getTokensSet #239

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
zayeem06 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix off-by-one range clamp in getTokensSet #239

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
6 changes: 3 additions & 3 deletions runtime/C/src/antlr3tokenstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,9 @@ getTokensSet (pANTLR3_COMMON_TOKEN_STREAM tokenStream, ANTLR3_UINT32 start, ANTL
{
fillBuffer(tokenStream);
}
if (stop > tokenStream->tstream->istream->size(tokenStream->tstream->istream))
if (stop >= tokenStream->tstream->istream->size(tokenStream->tstream->istream))
{
stop = tokenStream->tstream->istream->size(tokenStream->tstream->istream);
stop = tokenStream->tstream->istream->size(tokenStream->tstream->istream) - 1;
}
if (start > stop)
{
Expand All @@ -748,7 +748,7 @@ getTokensSet (pANTLR3_COMMON_TOKEN_STREAM tokenStream, ANTLR3_UINT32 start, ANTL
tok = tokenStream->tstream->get(tokenStream->tstream, i);

if ( types == NULL
|| types->isMember(types, tok->getType(tok) == ANTLR3_TRUE)
|| types->isMember(types, tok->getType(tok)) == ANTLR3_TRUE
)
{
filteredList->put(filteredList, n++, (void *)tok, NULL);
Expand Down