Skip to content

Stop the lexer reading past the end of a byte_range #3040

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

Merged
soutaro merged 1 commit into from
Aug 18, 2026
Merged

Stop the lexer reading past the end of a byte_range #3040

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/lexstate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ unsigned int rbs_peek(rbs_lexer_t *lexer) {
}

bool rbs_next_char(rbs_lexer_t *lexer, unsigned int *codepoint, size_t *byte_len) {
if (RBS_UNLIKELY(lexer->current.byte_pos == lexer->end_pos)) {
if (RBS_UNLIKELY(lexer->current.byte_pos >= lexer->end_pos)) {
return false;
}

Expand Down
19 changes: 19 additions & 0 deletions test/rbs/type_parsing_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,4 +1074,23 @@ def test_parse__byte_range_incorrect_in_euc_jp
assert_equal RBS::TypeName.parse("Foo"),
Parser.parse_type(euc, byte_range: 2...).name
end

def test_parse__byte_range_ending_mid_character
source = '"日本語" | Integer'

# Character count 5 as a byte offset lands inside `本` (bytes 4...7). The
# lexer used to step over the boundary and read the whole string instead.
assert_raises RBS::ParsingError do
Parser.parse_type(source, byte_range: 0...'"日本語"'.size)
end

Parser.parse_type(source, byte_range: 0...'"日本語"'.bytesize, require_eof: true).tap do |type|
assert_instance_of Types::Literal, type
assert_equal "日本語", type.literal
end

Parser.parse_type("Integer", byte_range: 0...9999).tap do |type|
assert_instance_of Types::ClassInstance, type
end
end
end
Loading