diff options
| author | Ray Strode <halfline@gmail.com> | 2021-07-22 18:54:46 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2021-07-22 18:54:46 +0000 |
| commit | b1ba6a99ef741a26dc2cfb2a1974149eb2f38f49 (patch) | |
| tree | 35e95d3646fe37dd907f0aa7befb1960a4de9cbb | |
| parent | e8e6a7e17bccb0ea5eac24cd11eaa042217ffab1 (diff) | |
| parent | f4922c046607c45d76e2911aa8f133d0ad4f9223 (diff) | |
| download | gdm-b1ba6a99ef741a26dc2cfb2a1974149eb2f38f49.tar.gz | |
Merge branch 'fix-overrun' into 'master'
local-display-factory: Fix overrun in session type list generation
See merge request GNOME/gdm!148
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index 0bb3851f..f2da3b6e 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -229,7 +229,7 @@ gdm_local_display_factory_get_session_type (GdmLocalDisplayFactory *factory, gboolean should_fall_back) { const char *session_types[3] = { NULL }; - gsize i, session_type_index = 0, number_of_session_types = 0; + gsize i, session_type_index = 0; g_autofree gchar *preferred_display_server = NULL; preferred_display_server = get_preferred_display_server (factory); @@ -240,22 +240,24 @@ gdm_local_display_factory_get_session_type (GdmLocalDisplayFactory *factory, for (i = 0; i < G_N_ELEMENTS (session_types) - 1; i++) { #ifdef ENABLE_WAYLAND_SUPPORT - if (number_of_session_types > 0 || + if (i > 0 || g_strcmp0 (preferred_display_server, "wayland") == 0) { gboolean wayland_enabled = FALSE; if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { - if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - session_types[number_of_session_types++] = "wayland"; + if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE)) { + session_types[i] = "wayland"; + } } } #endif - if (number_of_session_types > 0 || + if (i > 0 || g_strcmp0 (preferred_display_server, "xorg") == 0) { gboolean xorg_enabled = FALSE; if (gdm_settings_direct_get_boolean (GDM_KEY_XORG_ENABLE, &xorg_enabled)) { - if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE) ) - session_types[number_of_session_types++] = "x11"; + if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE)) { + session_types[i] = "x11"; + } } } } |