From d28d6505bd72f0d6e3e7a968c60c27f893da976e Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 7 Jul 2014 15:11:22 +1000 Subject: sdl: Fix crash when calling sdl_switch() with NULL surface This happens for example when doing ctrl-alt-u and segfaults Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Gerd Hoffmann --- ui/sdl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ui/sdl.c') diff --git a/ui/sdl.c b/ui/sdl.c index b89182a2c0..8bdbf521d1 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -135,12 +135,13 @@ static void do_sdl_resize(int width, int height, int bpp) static void sdl_switch(DisplayChangeListener *dcl, DisplaySurface *new_surface) { - PixelFormat pf = qemu_pixelformat_from_pixman(new_surface->format); + PixelFormat pf; /* temporary hack: allows to call sdl_switch to handle scaling changes */ if (new_surface) { surface = new_surface; } + pf = qemu_pixelformat_from_pixman(surface->format); if (!scaling_active) { do_sdl_resize(surface_width(surface), surface_height(surface), 0); -- cgit v1.2.1