Merge branch 'sdl-events' into 'master'

sdl: Fix null pointer dereference

See merge request redox-os/cookbook!204
This commit is contained in:
Jeremy Soller 2019-03-02 23:05:42 +00:00
commit f5fef67c61

View File

@ -380,7 +380,7 @@ diff -ruwN source/src/thread/pthread/SDL_systhread.c source-new/src/thread/pthre
diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orbital/SDL_orbitalevents.c
--- source/src/video/orbital/SDL_orbitalevents.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents.c 2018-12-29 15:57:00.298520310 -0700
@@ -0,0 +1,197 @@
@@ -0,0 +1,201 @@
+/*
+ SDL - Simple DirectMedia Layer
+ Copyright (C) 1997-2012 Sam Lantinga
@ -425,6 +425,10 @@ diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orb
+{
+ SDL_keysym keysym;
+
+ if (!this->hidden->window) {
+ return;
+ }
+
+ void* event_iter = orb_window_events(this->hidden->window);
+ OrbEventOption oeo = orb_events_next(event_iter);
+