ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A hack to invalidate the `frame_cache_data` pointer during the following events: 

Load Game, Reset, Init, Unload, Unload Game, Video Driver Destroy, Video Driver Free, Video Driver Init

This prevents an invalid pointer from being read if the first frame starts out paused.
This commit is contained in:
Dwedit 2018-07-06 09:53:31 -05:00
parent ceaa0259e5
commit 41ce61974d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core_impl.c
View File

@ -290,6 +290,8 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
bool contentless = false; bool contentless = false;
bool is_inited = false; bool is_inited = false;
video_driver_set_cached_frame_ptr(NULL);
#ifdef HAVE_RUNAHEAD #ifdef HAVE_RUNAHEAD
set_load_content_info(load_info); set_load_content_info(load_info);
clear_controller_port_map(); clear_controller_port_map();
@ -373,12 +375,16 @@ bool core_get_system_av_info(struct retro_system_av_info *av_info)
bool core_reset(void) bool core_reset(void)
{ {
video_driver_set_cached_frame_ptr(NULL);
current_core.retro_reset(); current_core.retro_reset();
return true; return true;
} }
bool core_init(void) bool core_init(void)
{ {
video_driver_set_cached_frame_ptr(NULL);
current_core.retro_init(); current_core.retro_init();
current_core.inited = true; current_core.inited = true;
return true; return true;
@ -386,6 +392,8 @@ bool core_init(void)
bool core_unload(void) bool core_unload(void)
{ {
video_driver_set_cached_frame_ptr(NULL);
current_core.retro_deinit(); current_core.retro_deinit();
return true; return true;
} }
@ -396,9 +404,12 @@ bool core_unload_game(void)
video_driver_free_hw_context(); video_driver_free_hw_context();
audio_driver_stop(); audio_driver_stop();
video_driver_set_cached_frame_ptr(NULL);
current_core.retro_unload_game(); current_core.retro_unload_game();
current_core.game_loaded = false; current_core.game_loaded = false;
return true; return true;
} }

3
gfx/video_driver.c
View File

@ -1595,6 +1595,7 @@ void video_driver_destroy(void)
video_driver_cache_context_ack = false; video_driver_cache_context_ack = false;
video_driver_record_gpu_buffer = NULL; video_driver_record_gpu_buffer = NULL;
current_video = NULL; current_video = NULL;
video_driver_set_cached_frame_ptr(NULL);
} }
void video_driver_set_cached_frame_ptr(const void *data) void video_driver_set_cached_frame_ptr(const void *data)
@ -1779,6 +1780,7 @@ bool video_driver_init(bool *video_is_threaded)
{ {
video_driver_lock_new(); video_driver_lock_new();
video_driver_filter_free(); video_driver_filter_free();
video_driver_set_cached_frame_ptr(NULL);
return video_driver_init_internal(video_is_threaded); return video_driver_init_internal(video_is_threaded);
} }
@ -1792,6 +1794,7 @@ void video_driver_free(void)
video_driver_free_internal(); video_driver_free_internal();
video_driver_lock_free(); video_driver_lock_free();
video_driver_data = NULL; video_driver_data = NULL;
video_driver_set_cached_frame_ptr(NULL);
} }
void video_driver_monitor_reset(void) void video_driver_monitor_reset(void)