Commit 32ec9839 authored by Changbin Du's avatar Changbin Du Committed by Gerd Hoffmann
Browse files

ui/sdl2: fix segment fault caused by null pointer dereference 



I found SDL_GetWindowFromID() sometimes return NULL when I start qemu via
ssh forwarding even the window has been crated already. I am not sure
whether this is a bug of SDL, but we'd better check it carefully.

Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Message-id: 20200427132412.17909-1-changbin.du@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent df2ac3cc

ui/sdl2.c

+12 −0
Original line number Diff line number Diff line
@@ -332,6 +332,10 @@ static void handle_keydown(SDL_Event *ev) 
    int gui_key_modifier_pressed = get_mod_state();

    int gui_keysym = 0;



    if (!scon) {

        return;

    }



    if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) {

        switch (ev->key.keysym.scancode) {

        case SDL_SCANCODE_2:
@@ -412,6 +416,10 @@ static void handle_keyup(SDL_Event *ev) 
{

    struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);



    if (!scon) {

        return;

    }



    scon->ignore_hotkeys = false;

    sdl2_process_key(scon, &ev->key);

}
@@ -421,6 +429,10 @@ static void handle_textinput(SDL_Event *ev) 
    struct sdl2_console *scon = get_scon_from_window(ev->text.windowID);

    QemuConsole *con = scon ? scon->dcl.con : NULL;



    if (!con) {

        return;

    }



    if (qemu_console_is_graphic(con)) {

        return;

    }