diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-20 03:10:08 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-20 03:10:08 +0800 |
| commit | 813548b463fc40e52f323074e1b88271400b6cf2 (patch) | |
| tree | 03ef4c3792a49cfa004433b4d12ecf50fcee6fd9 /x11 | |
| parent | 6eb802593c39b8409465b4239588c144f312c013 (diff) | |
| download | freebsd-ports-gnome-813548b463fc40e52f323074e1b88271400b6cf2.tar.gz freebsd-ports-gnome-813548b463fc40e52f323074e1b88271400b6cf2.tar.zst freebsd-ports-gnome-813548b463fc40e52f323074e1b88271400b6cf2.zip | |
Fix a crash that can occur due to a NULL pointer dereference when enabling
the greeter.
Obtained from: gdm2 CVS
Approved by: portmgr (implicit)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 1 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_greeter_greeter_item_ulist.c | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 452caddc59c6..a5d8159cc30f 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -8,6 +8,7 @@ PORTNAME= gdm PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/files/patch-gui_greeter_greeter_item_ulist.c b/x11/gdm/files/patch-gui_greeter_greeter_item_ulist.c new file mode 100644 index 000000000000..1fbc85410ad4 --- /dev/null +++ b/x11/gdm/files/patch-gui_greeter_greeter_item_ulist.c @@ -0,0 +1,20 @@ +=================================================================== +RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_item_ulist.c,v +retrieving revision 1.29 +retrieving revision 1.30 +diff -u -r1.29 -r1.30 +--- gui/greeter/greeter_item_ulist.c 2006/05/31 09:24:08 1.29 ++++ gui/greeter/greeter_item_ulist.c 2006/10/09 15:30:31 1.30 +@@ -66,8 +66,10 @@ + greeter_item_ulist_unset_selected_user (void) + { + GtkTreeSelection *selection; +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list)); +- gtk_tree_selection_unselect_all (selection); ++ if (user_list != NULL) { ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list)); ++ gtk_tree_selection_unselect_all (GTK_TREE_SELECTION (selection)); ++ } + + if (selected_user != NULL) + g_free (selected_user); |