Skip to content

Strengthen bound checks for switch indexes #1172

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 1 commit into from
Dec 17, 2021
Merged

Strengthen bound checks for switch indexes #1172

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
4 changes: 2 additions & 2 deletions compiler/lib/eval.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ let eval_branch info = function
Meanwhile, add guards to prevent Invalid_argument("index out of bounds")
see https://github.com/ocsigen/js_of_ocaml/issues/485 *)
match the_case_of info (Pv x) with
| CConst j when j < Array.length const -> Branch const.(j)
| CTag j when j < Array.length tags -> Branch tags.(j)
| CConst j when j >= 0 && j < Array.length const -> Branch const.(j)
| CTag j when j >= 0 && j < Array.length tags -> Branch tags.(j)
| CConst _ | CTag _ | Unknown -> b)
| _ as b -> b

Expand Down