Skip to content

Fix miri error in into_inner() of CString - #62610

Merged
bors merged 1 commit into
rust-lang:masterfrom
Stargateur:fix-miri-error-cstring-into_inner
Jul 14, 2019
Merged

Fix miri error in into_inner() of CString#62610
bors merged 1 commit into
rust-lang:masterfrom
Stargateur:fix-miri-error-cstring-into_inner

Conversation

@Stargateur

@StargateurStargateur commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

Fix#62553

I choice to not transmute because I think it's more unsafe and in case the structure change this code should always work.

r? @RalfJung

@rust-highfive

rust-highfive commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @RalfJung (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 12, 2019
hellow554
hellow554 suggested changes Jul 12, 2019
View reviewed changes
Comment threadsrc/libstd/ffi/c_str.rs Outdated
Comment threadsrc/libstd/ffi/c_str.rs Outdated
Comment threadsrc/libstd/ffi/c_str.rs Outdated
@Stargateur

Stargateur commented Jul 12, 2019

Copy link
Copy Markdown
ContributorAuthor

I would like to add a test but I don't know how.

RalfJung
RalfJung reviewed Jul 13, 2019
View reviewed changes
Comment threadsrc/libstd/ffi/c_str.rs Outdated
RalfJung
RalfJung reviewed Jul 13, 2019
View reviewed changes
Comment threadsrc/libstd/ffi/c_str.rs Outdated
RalfJung
RalfJung reviewed Jul 13, 2019
View reviewed changes
Comment threadsrc/libstd/ffi/c_str.rs Outdated
RalfJung
RalfJung reviewed Jul 13, 2019
View reviewed changes
Comment threadsrc/libstd/ffi/c_str.rs Outdated
@RalfJung

RalfJung commented Jul 13, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Thanks a lot! I prefer the ManuallyDrop version as well. :)

I would like to add a test but I don't know how.

You mean a test that this does not error in Miri any more? For that, please make a PR at https://github.com/rust-lang/miri/.

@RalfJungRalfJung mentioned this pull request Jul 13, 2019
Merged
@RalfJung

RalfJung commented Jul 14, 2019

Copy link
Copy Markdown
Member

This looks great! When you force-push and want a new review, please leave a note saying so; GitHub unfortunately does not send email notifications for force-pushes.

@bors r+

Do you want to try to add a Miri test case as well? Do you need mentoring for that?

@bors

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 4c4bd34 has been approved by RalfJung

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2019
@bors

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4c4bd34 with merge 85a360e...

bors added a commit that referenced this pull request Jul 14, 2019
@bors
Auto merge of#62610- Stargateur:fix-miri-error-cstring-into_inner, …
85a360e
…r=RalfJung
Fix miri error in into_inner() of CString
Fix#62553
I choice to not transmute because I think it's more unsafe and in case the structure change this code should always work.
r? @RalfJung
@borsbors mentioned this pull request Jul 14, 2019
Merged
@bors

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: RalfJung
Pushing 85a360e to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2019
@bors
bors merged commit 4c4bd34 into rust-lang:masterJul 14, 2019
@Stargateur
Stargateur deleted the fix-miri-error-cstring-into_inner branch July 14, 2019 20:48
@sugar700sugar700 mentioned this pull request Jul 31, 2019
Merged
@RalfJungRalfJung mentioned this pull request Oct 22, 2019
Merged
1 task
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
+1 more reviewer
@hellow554hellow554hellow554 requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@RalfJungRalfJung

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CString::into_raw() trigger miri

5 participants

@Stargateur@rust-highfive@RalfJung@bors@hellow554