summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2016-08-25 14:40:09 -0400
committerRay Strode <rstrode@redhat.com>2016-08-25 14:40:09 -0400
commit2208dba0ac9329e0844c8288ccf3f01094e5e305 (patch)
treea57cf2b0ec8297aee0d58958f2bd2d47d67857d1
parentf7c75de0bc77cef07a823278aec1417e9ada5422 (diff)
downloadgdm-2208dba0ac9329e0844c8288ccf3f01094e5e305.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.
-rw-r--r--daemon/gdm-wayland-session.c8
-rw-r--r--daemon/gdm-x-session.c8
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;
}