From 376547044c858eb670b9b29aba38347bb132d8ec Mon Sep 17 00:00:00 2001 From: jovonna Date: Mon, 6 Jan 2020 21:52:13 -0500 Subject: [PATCH] fix null pointer deref in new dispserv_null code --- gfx/video_display_server.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c index c6ed30c110..c2477a3c4c 100644 --- a/gfx/video_display_server.c +++ b/gfx/video_display_server.c @@ -74,7 +74,8 @@ void* video_display_server_init(void) break; } - current_display_server_data = current_display_server->init(); + if (current_display_server->init) + current_display_server_data = current_display_server->init(); RARCH_LOG("[Video]: Found display server: %s\n", current_display_server->ident); @@ -90,7 +91,7 @@ void video_display_server_destroy(void) if (initial_screen_orientation != current_screen_orientation) video_display_server_set_screen_orientation(initial_screen_orientation); - if (current_display_server && current_display_server->destroy) + if (current_display_server) if (current_display_server_data) current_display_server->destroy(current_display_server_data); }