Skip to content

fix(scanner): avoid out-of-bounds read of valid_symbols during error recovery #258

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

fix(scanner): avoid out-of-bounds read of valid_symbols during error recovery #258

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
8 changes: 7 additions & 1 deletion src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,13 @@ bool tree_sitter_nu_external_scanner_scan(
TSLexer *lexer,
const bool *valid_symbols
) {
if (valid_symbols[ERROR_SENTINEL]) {
// During error recovery tree-sitter marks every real external token as
// valid; ERROR_SENTINEL is not a declared external token, so indexing
// valid_symbols[ERROR_SENTINEL] reads past the end of the array. Detect
// error recovery by checking only the valid, in-range token slots.
if (valid_symbols[RAW_STRING_BEGIN] &&
valid_symbols[RAW_STRING_CONTENT] &&
valid_symbols[RAW_STRING_END]) {
return false;
}

Expand Down
Loading