Backward-compatible fix for #968 #970
Merged
Conversation
This file contains hidden or 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
This is a minimal fix for rust-random#968.
vks
reviewed
May 11, 2020
| @@ -55,8 +55,8 @@ const THREAD_RNG_RESEED_THRESHOLD: u64 = 1024 * 64; | |||
| /// [`StdRng`]: crate::rngs::StdRng | |||
| #[derive(Copy, Clone, Debug)] | |||
| pub struct ThreadRng { | |||
| // inner raw pointer implies type is neither Send nor Sync | |||
| rng: NonNull<ReseedingRng<Core, OsRng>>, | |||
| // type if neither Send nor Sync | |||
|
Darn, appears I pushed to the wrong destination and accidentally merged (no protection on this branch). @vks do you approve or shall I revert? |
|
It's fine with me, I just did not check whether this actually fixes the use-after-free. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This is @josephlr's fix (3) from #968.
Personally I see 2-5% performance penalty vs Joseph's ~16% (same benchmarks; in my case using Xeon E3-1231 aka Haswell with Fedora 31). Either way, real-world impact will usually be much lower due to the tight loops in the benchmarks.
CC @nathdobson @burdges @bjorn3.