Skip to content

[Gtk] Make Tree/Table cellDataProc safe for disposed items #2472

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
Sep 1, 2025
Merged

[Gtk] Make Tree/Table cellDataProc safe for disposed items #2472

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
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ long cellDataProc (long tree_column, long cell, long tree_model, long iter, long
int [] index = new int [1];
C.memmove (index, GTK.gtk_tree_path_get_indices (path), 4);
TableItem item = _getItem (index[0]);
if (item.isDisposed()) {
return 0;
}
GTK.gtk_tree_path_free (path);
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
boolean isPixbuf = GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell);
Expand Down
3 changes: 3 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,9 @@ static int checkStyle (int style) {
long cellDataProc (long tree_column, long cell, long tree_model, long iter, long data) {
if (cell == ignoreCell) return 0;
TreeItem item = _getItem (iter);
if (item.isDisposed()) {
return 0;
}
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
boolean isPixbuf = GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell);
boolean isText = GTK.GTK_IS_CELL_RENDERER_TEXT (cell);
Expand Down
Loading