Skip to content

Fix fatal compiler error that occurred when an %ffi extension point contained invalid JavaScript #7998

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
merged 2 commits into from
Nov 1, 2025
Merged

Fix fatal compiler error that occurred when an %ffi extension point contained invalid JavaScript #7998

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
7861581
Check pos >= 0 and len >= 0 before doing String.sub in Code_frame.print
mediremi Oct 28, 2025
52b065d
Add CHANGELOG
mediremi Oct 28, 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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#### :bug: Bug fix

- Fix fatal compiler error that occurred when an `%ffi` extension point contained invalid JavaScript https://github.com/rescript-lang/rescript/pull/7998

#### :memo: Documentation

#### :nail_care: Polish
Expand Down
33 changes: 19 additions & 14 deletions compiler/ml/code_frame.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,20 +136,25 @@ let print ~is_warning ~src ~(start_pos : Lexing.position)
(* 3 for separator + the 2 spaces around it *)
let line_width = 78 - max_line_digits_count - indent - 3 in
let lines =
String.sub src start_line_line_offset
(end_line_line_end_offset - start_line_line_offset)
|> String.split_on_char '\n'
|> filter_mapi (fun i line ->
let line_number = i + first_shown_line in
if more_than_5_highlighted_lines then
if line_number = highlight_line_start_line + 2 then
Some (Elided, line)
else if
line_number > highlight_line_start_line + 2
&& line_number < highlight_line_end_line - 1
then None
else Some (Number line_number, line)
else Some (Number line_number, line))
if
start_line_line_offset >= 0
&& end_line_line_end_offset >= start_line_line_offset
then
String.sub src start_line_line_offset
(end_line_line_end_offset - start_line_line_offset)
|> String.split_on_char '\n'
|> filter_mapi (fun i line ->
let line_number = i + first_shown_line in
if more_than_5_highlighted_lines then
if line_number = highlight_line_start_line + 2 then
Some (Elided, line)
else if
line_number > highlight_line_start_line + 2
&& line_number < highlight_line_end_line - 1
then None
else Some (Number line_number, line)
else Some (Number line_number, line))
else []
in
let leading_space_to_cut =
lines
Expand Down
Loading