commit c77f258b4a51097959e9eb024a95c728bc11b612
author Armin Krezović <krezovic.armin@gmail.com> Thu Jun 23 11:59:32 2016 +0200
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Mon Jun 27 13:17:05 2016 +0300
tree 48a8878c2fa3febe11b9f90c2b3e9d433a5b8d91
parent 7dda25b2d5ec6e79561d9e558b21e0230166605b

desktop-shell: Avoid NULL pointer dereference

When there are no outputs present, an output pointer
can be NULL. Dereferencing such pointer will result
in a crash.

Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>

desktop-shell/shell.c

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 7deba55..825c6c3 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2290,7 +2290,7 @@
 static void
 restore_output_mode(struct weston_output *output)
 {
-	if (output->original_mode)
+	if (output && output->original_mode)
 		weston_output_mode_switch_to_native(output);
 }