diff options
author | Alberto Garcia <berto@igalia.com> | 2015-06-08 11:12:15 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-07-29 18:33:50 -0500 |
commit | 9272707a1f64c06697360c63a0eb1acc3e45f11b (patch) | |
tree | f13c69c77cd74bbc83f6a77a841c2ff16689c496 | |
parent | c759f1a0784d8e2d5ab4c88ac2856108b5e311e9 (diff) | |
download | qemu-9272707a1f64c06697360c63a0eb1acc3e45f11b.zip qemu-9272707a1f64c06697360c63a0eb1acc3e45f11b.tar.gz qemu-9272707a1f64c06697360c63a0eb1acc3e45f11b.tar.bz2 |
sdl2: fix crash in handle_windowevent() when restoring the screen size
The Ctrl-Alt-u keyboard shortcut restores the screen to its original
size. In the SDL2 UI this is done by destroying the window and
creating a new one. The old window emits SDL_WINDOWEVENT_HIDDEN when
it's destroyed, but trying to call SDL_GetWindowFromID() from that
event's window ID returns a null pointer. handle_windowevent() assumes
that the pointer is never null so it results in a crash.
Cc: qemu-stable@nongnu.org
Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 08d49df0dbaacc220a099dbfb644e1dc0eda57be)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | ui/sdl2.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -511,6 +511,10 @@ static void handle_windowevent(SDL_Event *ev) { struct sdl2_console *scon = get_scon_from_window(ev->window.windowID); + if (!scon) { + return; + } + switch (ev->window.event) { case SDL_WINDOWEVENT_RESIZED: { |