From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 7 Jul 2014 05:11:22 +0000 (+1000)
Subject: sdl: Fix crash when calling sdl_switch() with NULL surface
X-Git-Tag: v2.3.0-rc0~16^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28d6505bd72f0d6e3e7a968c60c27f893da976e;p=thirdparty%2Fqemu.git

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 <benh@kernel.crashing.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/sdl.c b/ui/sdl.c
index b89182a2c0f..8bdbf521d10 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);