fix: make C FFI more robust with respect to malformed input #5408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wolffcm
force-pushed
the
wolffcm/fix-cffi
branch
from
4873bcd
to
335e3d7
Compare
crepererum
approved these changes
Apr 12, 2023
libflux/flux/src/cffi.rs
Outdated
| @@ -123,12 +124,30 @@ pub unsafe extern "C" fn flux_parse( | |||
| cfname: *const c_char, | |||
| csrc: *const c_char, | |||
| ) -> Box<ast::Package> { | |||
| let fname = String::from_utf8(CStr::from_ptr(cfname).to_bytes().to_vec()).unwrap(); | |||
| let src = String::from_utf8(CStr::from_ptr(csrc).to_bytes().to_vec()).unwrap(); | |||
| let fname = match String::from_utf8(CStr::from_ptr(cfname).to_bytes().to_vec()) { | |||
There was a problem hiding this comment.
This error handling doesn't look super elegant, but a) it's only two occasions and b) I couldn't come up with something nicer.
|
BTW: another way to guard your FFI interfaces against all sorts of panics is |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An audit discovered a few places where we could be more rigorous about checking inputs for valid data. This PR addresses the issues and adds tests for them.