Skip to content

jruby: Pass end index to byteListToInum #150

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
kou merged 2 commits into from
May 3, 2025
+7 −1
Merged

jruby: Pass end index to byteListToInum #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679754f
Pass end to byteListToInum rather than len
headius May 3, 2025
cec6887
Add a test for scan_integer at non-zero pos
headius May 3, 2025
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 ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ private RubyInteger strscanParseInteger(Ruby runtime, ByteList bytes, int ptr, i
setMatched();
adjustRegisters();

return ConvertBytes.byteListToInum(runtime, bytes, ptr, len, base, true);
return ConvertBytes.byteListToInum(runtime, bytes, ptr, ptr + len, base, true);
}

private void strscanMustAsciiCompat(Ruby runtime) {
Expand Down
6 changes: 6 additions & 0 deletions test/strscan/test_stringscanner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,12 @@ def test_scan_integer
assert_equal(huge_integer.to_i, s.scan_integer)
assert_equal(2_000, s.pos)
assert_predicate(s, :matched?)

s = create_string_scanner('abc1')
s.pos = 3
assert_equal(1, s.scan_integer)
assert_equal(4, s.pos)
assert_predicate(s, :matched?)
end

def test_scan_integer_unmatch
Expand Down
Loading