From 2208dba0ac9329e0844c8288ccf3f01094e5e305 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 25 Aug 2016 14:40:09 -0400 Subject: gdm-{wayland,x}-session: fix segfault if run with no arguments Right now we crash on clean up paths if the programs are invoked wrong. This commit fixes that. --- daemon/gdm-wayland-session.c | 8 +++++--- daemon/gdm-x-session.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c index 149eb8a1..449803b3 100644 --- a/daemon/gdm-wayland-session.c +++ b/daemon/gdm-wayland-session.c @@ -472,9 +472,11 @@ main (int argc, } out: - signal_subprocesses (state); - wait_on_subprocesses (state); - clear_state (&state); + if (state != NULL) { + signal_subprocesses (state); + wait_on_subprocesses (state); + clear_state (&state); + } return exit_status; } diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c index d0a00cad..b4f34cdb 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c @@ -850,9 +850,11 @@ main (int argc, } out: - signal_subprocesses (state); - wait_on_subprocesses (state); - clear_state (&state); + if (state != NULL) { + signal_subprocesses (state); + wait_on_subprocesses (state); + clear_state (&state); + } return exit_status; } -- cgit v1.2.1