mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Changbin Du <changbin.du@gmail.com>
Message-id: 20200427132412.17909-1-changbin.du@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Changbin Du 2020-04-27 21:24:12 +08:00 committed by Gerd Hoffmann
parent df2ac3cc12
commit 32ec9839d8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/sdl2.c
View File

@ -332,6 +332,10 @@ static void handle_keydown(SDL_Event *ev)
int gui_key_modifier_pressed = get_mod_state(); int gui_key_modifier_pressed = get_mod_state();
int gui_keysym = 0; int gui_keysym = 0;
if (!scon) {
return;
}
if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) { if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) {
switch (ev->key.keysym.scancode) { switch (ev->key.keysym.scancode) {
case SDL_SCANCODE_2: 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); struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
if (!scon) {
return;
}
scon->ignore_hotkeys = false; scon->ignore_hotkeys = false;
sdl2_process_key(scon, &ev->key); 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); struct sdl2_console *scon = get_scon_from_window(ev->text.windowID);
QemuConsole *con = scon ? scon->dcl.con : NULL; QemuConsole *con = scon ? scon->dcl.con : NULL;
if (!con) {
return;
}
if (qemu_console_is_graphic(con)) { if (qemu_console_is_graphic(con)) {
return; return;
} }