Fix "dereferencing a null pointer" in C layout tests #2203
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
Instead of dereferencing a null pointer, create a MaybeUninit from which we can extract well-defined addresses.
gh2o
force-pushed
the
no-null-deref-in-layout-tests
branch
from
be49600 to
a191871
Compare
|
This looks as though it would close #1651. |
|
Will also fix: #2204 |
| &(*(::#prefix::ptr::null::<#canonical_ident>())).#field_name as *const _ as usize | ||
| let uninit = ::#prefix::mem::MaybeUninit::<#canonical_ident>::uninit(); | ||
| let ptr = uninit.as_ptr(); | ||
| ::#prefix::ptr::addr_of!((*ptr).#field_name) as usize - ptr as usize |
There was a problem hiding this comment.
using offset_from() might work here (as #field_offset will be a literal you don't need to worry about usize/isize conversions)
There was a problem hiding this comment.
offset_from() assumes that the two pointers have the same type, which is not the case in this case, and if we were to cast to *const u8, I would rather just directly use usize.
emilio
approved these changes
May 17, 2022
This was referenced May 17, 2022
simonrw
added a commit
to simonrw/rust-fitsio
that referenced
this pull request
Jul 11, 2022
It seems just a version bump was required. Looks like this PR: rust-lang/rust-bindgen#2203
lopopolo
added a commit
to artichoke/artichoke
that referenced
this pull request
Sep 23, 2022
Pull in fix for rust-lang/rust-bindgen#2203 and remove allow on null pointer dereference lint.
2 tasks
mulkieran
added a commit
to mulkieran/stratisd
that referenced
this pull request
Jan 3, 2023
Was fixed in rust-lang/rust-bindgen#2203 Signed-off-by: mulhern <[email protected]>
michaellass
added a commit
to michaellass/e2p-sys
that referenced
this pull request
Feb 15, 2023
copybara-service bot
pushed a commit
to chromeos/adhd
that referenced
this pull request
May 31, 2023
bindgen is using addr_of! instead of "reference first and convert to pointer later" since rust-lang/rust-bindgen#2203. Regenerate bindings.rs with bindgen 0.63.0. BUG=b:239850356 TEST=cargo clippy Change-Id: Id4f6f4c0ccbf222de27cd35d42dbdda7958dac2f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/4570362 Commit-Queue: Chih-Yang Hsia <[email protected]> Tested-by: [email protected] <[email protected]> Tested-by: ChromeOS Audio Quick Verifier <[email protected]> Tested-by: Chih-Yang Hsia <[email protected]> Reviewed-by: Li-Yu Yu <[email protected]>
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.
Instead of dereferencing a null pointer, create a
MaybeUninitfrom which we can extract well-defined addresses.