Skip to content

glib: Make sure that empty glib::StrV / glib::PtrSlice returns a valid pointer #1734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2025
Merged

glib: Make sure that empty glib::StrV / glib::PtrSlice returns a valid pointer #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37fc03e
glib: Remove nonsense comments about `glib::Slice` pointers being `NU…
sdroege Jun 11, 2025
b4e16a5
glib: Make sure that empty `glib::StrV` / `glib::PtrSlice` returns a …
sdroege Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions glib/src/collections/ptr_slice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,13 +658,21 @@ impl<T: TransparentPtrType> PtrSlice<T> {
/// This is guaranteed to be `NULL`-terminated.
#[inline]
pub fn into_raw(mut self) -> *mut <T as GlibPtrDefault>::GlibType {
// Make sure to allocate a valid pointer that points to a
// NULL-pointer.
if self.len == 0 {
ptr::null_mut()
} else {
self.len = 0;
self.capacity = 0;
self.ptr.as_ptr()
self.reserve(0);
unsafe {
ptr::write(
self.ptr.as_ptr().add(0),
Ptr::from(ptr::null_mut::<<T as GlibPtrDefault>::GlibType>()),
);
}
}

self.len = 0;
self.capacity = 0;
self.ptr.as_ptr()
}

// rustdoc-stripper-ignore-next
Expand Down
6 changes: 0 additions & 6 deletions glib/src/collections/slice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,6 @@ impl<T: TransparentType> Slice<T> {

// rustdoc-stripper-ignore-next
/// Returns the underlying pointer.
///
/// This is guaranteed to be `NULL`-terminated.
#[inline]
pub fn as_ptr(&self) -> *const T::GlibType {
if self.len == 0 {
Expand All @@ -559,8 +557,6 @@ impl<T: TransparentType> Slice<T> {

// rustdoc-stripper-ignore-next
/// Returns the underlying pointer.
///
/// This is guaranteed to be `NULL`-terminated.
#[inline]
pub fn as_mut_ptr(&mut self) -> *mut T::GlibType {
if self.len == 0 {
Expand All @@ -572,8 +568,6 @@ impl<T: TransparentType> Slice<T> {

// rustdoc-stripper-ignore-next
/// Consumes the slice and returns the underlying pointer.
///
/// This is guaranteed to be `NULL`-terminated.
#[inline]
pub fn into_raw(mut self) -> *mut T::GlibType {
if self.len == 0 {
Expand Down
15 changes: 10 additions & 5 deletions glib/src/collections/strv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,18 @@ impl StrV {
/// This is guaranteed to be `NULL`-terminated.
#[inline]
pub fn into_raw(mut self) -> *mut *mut c_char {
// Make sure to allocate a valid pointer that points to a
// NULL-pointer.
if self.len == 0 {
ptr::null_mut()
} else {
self.len = 0;
self.capacity = 0;
self.ptr.as_ptr()
self.reserve(0);
unsafe {
*self.ptr.as_ptr().add(0) = ptr::null_mut();
}
}

self.len = 0;
self.capacity = 0;
self.ptr.as_ptr()
}

// rustdoc-stripper-ignore-next
Expand Down
Loading