Skip to content

glib: Fix segfault in List::retain() #1777

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 1 commit into from
Aug 7, 2025
Merged

glib: Fix segfault in List::retain() #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion glib/src/collections/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ impl<T: TransparentPtrType> List<T> {
unsafe {
let mut ptr = head.as_ptr();
while !ptr.is_null() {
let item = &*((*ptr).data as *const ffi::gpointer as *const T);
let item = &*(&(*ptr).data as *const ffi::gpointer as *const T);
let next = (*ptr).next;
if !f(item) {
ptr::drop_in_place(&mut (*ptr).data as *mut ffi::gpointer as *mut T);
Expand Down Expand Up @@ -909,6 +909,12 @@ mod test {
let mut list_items = list2.iter().cloned().collect::<Vec<_>>();
list_items.reverse();
assert_eq!(&items[1..], &list_items);

list.reverse();
let mut list3 = list.clone();
list3.retain(|item| item.seconds() >= 14.0);
let list_items = list3.iter().cloned().collect::<Vec<_>>();
assert_eq!(&items[2..], &list_items);
}

#[test]
Expand Down
8 changes: 7 additions & 1 deletion glib/src/collections/slist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ impl<T: TransparentPtrType> SList<T> {
unsafe {
let mut ptr = head.as_ptr();
while !ptr.is_null() {
let item = &*((*ptr).data as *const ffi::gpointer as *const T);
let item = &*(&(*ptr).data as *const ffi::gpointer as *const T);
let next = (*ptr).next;
if !f(item) {
ptr::drop_in_place(&mut (*ptr).data as *mut ffi::gpointer as *mut T);
Expand Down Expand Up @@ -902,6 +902,12 @@ mod test {
let mut list_items = list2.iter().cloned().collect::<Vec<_>>();
list_items.reverse();
assert_eq!(&items[1..], &list_items);

list.reverse();
let mut list3 = list.clone();
list3.retain(|item| item.seconds() >= 14.0);
let list_items = list3.iter().cloned().collect::<Vec<_>>();
assert_eq!(&items[2..], &list_items);
}

#[test]
Expand Down
Loading