[Qemu-devel] [PULL 0/1] sdl patch queue

[Qemu-devel] [PULL 0/1] sdl patch queue

[Gerd Hoffmann]

  Hi,

Single fix patch queue for sdl.

please pull,
  Gerd

The following changes since commit ee09f84e6bf5383a23c9624115c26b72aa1e076c:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-06-08 15:57:41 +0100)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-sdl-20150611-1

for you to fetch changes up to 08d49df0dbaacc220a099dbfb644e1dc0eda57be:

  sdl2: fix crash in handle_windowevent() when restoring the screen size (2015-06-09 10:25:21 +0200)

----------------------------------------------------------------
sdl2: fix crash in handle_windowevent() when restoring the screen size

----------------------------------------------------------------
Alberto Garcia (1):
      sdl2: fix crash in handle_windowevent() when restoring the screen size

 ui/sdl2.c | 4 ++++
 1 file changed, 4 insertions(+)

[Qemu-devel] [PULL 1/1] sdl2: fix crash in handle_windowevent() when restoring the screen size

[Gerd Hoffmann]

From: Alberto Garcia <berto@igalia.com>

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>
---
 ui/sdl2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/sdl2.c b/ui/sdl2.c
index 2d60179..5cb75aa 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -521,6 +521,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:
         {
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/1] sdl patch queue

[Peter Maydell]

On 11 June 2015 at 09:37, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Single fix patch queue for sdl.
>
> please pull,
>   Gerd
>
> The following changes since commit ee09f84e6bf5383a23c9624115c26b72aa1e076c:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-06-08 15:57:41 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-sdl-20150611-1
>
> for you to fetch changes up to 08d49df0dbaacc220a099dbfb644e1dc0eda57be:
>
>   sdl2: fix crash in handle_windowevent() when restoring the screen size (2015-06-09 10:25:21 +0200)
>
> ----------------------------------------------------------------
> sdl2: fix crash in handle_windowevent() when restoring the screen size
>
> ----------------------------------------------------------------
> Alberto Garcia (1):
>       sdl2: fix crash in handle_windowevent() when restoring the screen size

Applied, thanks.

-- PMM