do not panic on bad utf-8 received from ffi #728
Merged
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
r10s
changed the title
…llformatted utf-8
r10s
changed the title
flub
approved these changes
Oct 19, 2019
| ffi_msg.message.set_file(as_str(file), as_opt_str(filemime)) | ||
| ffi_msg.message.set_file( | ||
| to_string_lossy(file), | ||
| to_opt_string_lossy(filemime).as_ref().map(|x| x.as_str()), |
There was a problem hiding this comment.
This probably is safe, but I had to think about that. I've still not studied or fully internalised the rules on when rust keeps objects alive though, only have a vague notion and know that it allows terrible mistakes with raw pointers in some cases.
I'd have stored the string in a local variable instead.
There was a problem hiding this comment.
maybe we should also provide a to_opt_path_lossy() function that does not crashes but returns None when utf-8 is bad in some way. but i wanted to fix this pr mainly the android crash and similar ffi functions.
there are also some as_str() calls eg. in the mime-parser that should probably be replaced the same way.
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.
prefer to_string_lossy() for converting c-strings to String
c-strings may always be badly formatted and this should never lead to a panic.
fixes deltachat/deltachat-android#1065
see also #674 #679 that already does the conversion on other places.