Fix bug in bindings of pango::shape_full and pango::shape_with_flags #1681
+12
−9
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
sdroege
reviewed
Mar 11, 2025
pango/src/functions.rs
Outdated
| // Using to_glib_none() on &str will copy the string and cause problems. | ||
| ffi::pango_shape_full( | ||
| item_text.to_glib_none().0, | ||
| item_text.as_bytes().to_glib_none().0 as *const c_char, |
There was a problem hiding this comment.
Suggested change
| item_text.as_bytes().to_glib_none().0 as *const c_char, | |
| item_text.as_ptr() as *const c_char, |
seems simpler. Can you update that? Otherwise seems all correct, thanks!
sdroege
added
the
needs-backport
|
I changed it to use as_ptr in all 4 cases (and made both functions use the same local variable definitions). |
sdroege
reviewed
Mar 11, 2025
sdroege
added
backported
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fix for issue #1680.
The implementation of
&str::to_glib_none()copies the string and causes an error, as theitem_textargument is required to be a sub sequence of paragraph_text (if paragraph_text is not null). This is no longer the case after copying both strings.The new wrapper uses
&str::as_bytes()to prevent the copy. Bothpango_shape_fullandpango_shape_with_flagsdo not rely on null terminators when passing a non-negative length as argument, so this does not cause undefined behavior.