empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix NULL pointer dereference if gametype changes from NULL

Browse source
This commit is contained in:
Ilari Liusvaara 2013-09-24 12:59:55 +03:00
parent 01c6855072
commit 9a714d0c7f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/moviedata.cpp
View file

@ -341,7 +341,8 @@ void do_load_beginning(bool reload) throw(std::bad_alloc, std::runtime_error)
movb.get_movie().reset_state();
random_seed_value = our_movie.movie_rtc_second;
our_rom->load(our_movie.movie_rtc_second, our_movie.movie_rtc_subsecond);
gametype_changes = (&our_movie.gametype->get_type() != our_rom->rtype) && reload;
gametype_changes = (!our_movie.gametype || &our_movie.gametype->get_type() != our_rom->rtype) &&
reload;
our_movie.gametype = &our_rom->rtype->combine_region(*our_rom->region);
if(reload) {
if(!ro || gametype_changes)