Skip to content

Raise ValueError if \x00 character exists for eval argument #4052

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
youknowone merged 10 commits into from
Aug 13, 2022
Merged

Raise ValueError if \x00 character exists for eval argument #4052

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56f08a1
Make eval able to receive bytes also
moreal Aug 12, 2022
bb8526a
Raise ValueError if null character exists for eval argument
moreal Aug 12, 2022
c7689c9
Remove todo comment of resolved issue
moreal Aug 12, 2022
20e7752
Apply `cargo fmt`
moreal Aug 12, 2022
7e88c8f
Inline error type
moreal Aug 12, 2022
6d01742
Unmark resolved tests
moreal Aug 12, 2022
0bd702d
Use `ArgStrOrBytesLike` python argument type
moreal Aug 13, 2022
714ce4d
Wrap unicode error as syntax error
moreal Aug 13, 2022
879ed6e
Make loop simple with `slice::contains
moreal Aug 13, 2022
c672d8f
Make mapping error simple with `map_err`
moreal Aug 13, 2022
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
Prev Previous commit
Next Next commit
Wrap unicode error as syntax error
  • Loading branch information
@moreal
moreal committed Aug 13, 2022
commit 714ce4d07d7c900e7ceb2dab9eae725f15f749e4
14 changes: 11 additions & 3 deletions vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,17 @@ mod builtins {
}
}

Ok(Either::A(
vm.ctx.new_str(std::str::from_utf8(source).unwrap()),
))
match std::str::from_utf8(source) {
Ok(s) => Ok(Either::A(vm.ctx.new_str(s))),
Err(err) => {
let msg = format!(
"(unicode error) 'utf-8' codec can't decode byte 0x{:x?} in position {}: invalid start byte",
source[err.valid_up_to()],
err.valid_up_to()
);
Err(vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg))
}
Copy link
Copy Markdown
Member

@youknowone youknowone Aug 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to handle error first not to disturb to read main control flow

Suggested change
match std::str::from_utf8(source) {
Ok(s) => Ok(Either::A(vm.ctx.new_str(s))),
Err(err) => {
let msg = format!(
"(unicode error) 'utf-8' codec can't decode byte 0x{:x?} in position {}: invalid start byte",
source[err.valid_up_to()],
err.valid_up_to()
);
Err(vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg))
}
let source = std::str::from_utf8(source).map_err(|err| {
let msg = format!(
"(unicode error) 'utf-8' codec can't decode byte 0x{:x?} in position {}: invalid start byte",
source[err.valid_up_to()],
err.valid_up_to()
);
Err(vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg))
})?;
Either::A(vm.ctx.new_str(s))),

Copy link
Copy Markdown
Contributor Author

@moreal moreal Aug 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I applied it in c672d8f.

}
}
Either::B(code) => Ok(Either::B(code)),
}?;
Expand Down