diff options
author | Ray Strode <rstrode@redhat.com> | 2016-08-25 14:40:09 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2018-02-12 10:07:53 -0500 |
commit | 5926f234b5849e21424383f28ea23f3844991402 (patch) | |
tree | 030a82cbeee55b87846d9302ccde7a699ff48fd3 | |
parent | ce2ef875cae926ea7d07ca55eef802d9a6c4e033 (diff) | |
download | gdm-5926f234b5849e21424383f28ea23f3844991402.tar.gz |
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.
https://bugzilla.gnome.org/show_bug.cgi?id=770561
-rw-r--r-- | daemon/gdm-wayland-session.c | 8 | ||||
-rw-r--r-- | 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 b648e9de..94f49e19 100644 --- a/daemon/gdm-wayland-session.c +++ b/daemon/gdm-wayland-session.c @@ -545,9 +545,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 88fe96f4..3b2fcef4 100644 --- a/daemon/gdm-x-session.c +++ b/daemon/gdm-x-session.c @@ -921,9 +921,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; } |