[PATCH weston 04/12] desktop-shell: Avoid NULL pointer dereference

Armin Krezović krezovic.armin at gmail.com
Thu Jun 23 09:59:32 UTC 2016


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 at sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin at gmail.com>
---
 desktop-shell/shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index c48d41a..19a20ac 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2290,7 +2290,7 @@ shell_surface_set_class(struct wl_client *client,
 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);
 }
 
-- 
2.9.0



More information about the wayland-devel mailing list