glib: Add various IntoStrV impls
#977
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
sdroege
added
the
needs-backport
And don't copy any strings in the ones for containers of already `NUL`-terminated strings. Fixes gtk-rs#976
sdroege
force-pushed
the
more-intostrv-impls
branch
from
f96b811
to
a2a9eb0
Compare
andy128k
reviewed
Feb 10, 2023
| @@ -1151,7 +1241,8 @@ impl<const N: usize> IntoStrV for [GString; N] { | |||
| let mut strs = ptrs.add(self.len() + 1) as *mut c_char; | |||
|
|
|||
| for (i, item) in self.iter().enumerate() { | |||
| ptr::copy_nonoverlapping(item.as_ptr(), strs, item.len() + 1); | |||
| ptr::copy_nonoverlapping(item.as_ptr() as *const _, strs, item.len()); | |||
| *strs.add(item.len()) = 0; | |||
| *ptrs.add(i) = strs; | |||
| strs = strs.add(item.len() + 1); | |||
There was a problem hiding this comment.
Should we care about alignment?
There was a problem hiding this comment.
char arrays have an alignment of 1 so that's fine here. But that's exactly why the pointers come first and afterwards the characters :)
andy128k
approved these changes
Feb 10, 2023
pbor
added
backported
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.
And don't copy any strings in the ones for containers of already
NUL-terminated strings.Fixes #976