Skip to content

fix oob read in UTF32 LA from byte-scaled bounds check #241

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 oob read in UTF32 LA from byte-scaled bounds check #241

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/antlr3inputstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,7 +1677,7 @@ antlr3UTF32LA(pANTLR3_INT_STREAM is, ANTLR3_INT32 la)

input = ((pANTLR3_INPUT_STREAM) (is->super));

if (( ((pANTLR3_UINT8)input->nextChar) + la - 1) >= (((pANTLR3_UINT8)input->data) + input->sizeBuf))
if (( (pANTLR3_UINT8)((pANTLR3_UINT32)input->nextChar + la - 1) + sizeof(ANTLR3_UINT32)) > (((pANTLR3_UINT8)input->data) + input->sizeBuf))
{
return ANTLR3_CHARSTREAM_EOF;
}
Expand All @@ -1701,7 +1701,7 @@ antlr3UTF32LALE(pANTLR3_INT_STREAM is, ANTLR3_INT32 la)

input = ((pANTLR3_INPUT_STREAM) (is->super));

if (( ((pANTLR3_UINT8)input->nextChar) + la - 1) >= (((pANTLR3_UINT8)input->data) + input->sizeBuf))
if (( (pANTLR3_UINT8)((pANTLR3_UINT32)input->nextChar + la - 1) + sizeof(ANTLR3_UINT32)) > (((pANTLR3_UINT8)input->data) + input->sizeBuf))
{
return ANTLR3_CHARSTREAM_EOF;
}
Expand Down Expand Up @@ -1732,7 +1732,7 @@ antlr3UTF32LABE(pANTLR3_INT_STREAM is, ANTLR3_INT32 la)

input = ((pANTLR3_INPUT_STREAM) (is->super));

if (( ((pANTLR3_UINT8)input->nextChar) + la - 1) >= (((pANTLR3_UINT8)input->data) + input->sizeBuf))
if (( (pANTLR3_UINT8)((pANTLR3_UINT32)input->nextChar + la - 1) + sizeof(ANTLR3_UINT32)) > (((pANTLR3_UINT8)input->data) + input->sizeBuf))
{
return ANTLR3_CHARSTREAM_EOF;
}
Expand Down