libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-27 10:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure we always first iniatilize TOC variables with TOC_Clear

Browse Source 
before using them
This commit is contained in:
twinaphex 2015-07-29 01:50:27 +02:00
parent aa92168042
commit dfa5275687
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libretro.cpp
View File

@ -2228,10 +2228,11 @@ static void update_md5_checksum(CDIF *iface)
{
uint8 LayoutMD5[16];
md5_context layout_md5;
CD_TOC toc;
layout_md5.starts();
CD_TOC toc;
TOC_Clear(&toc);
iface->ReadTOC(&toc);
@ -2721,21 +2722,22 @@ MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
// Print out a track list for all discs. //
for(unsigned i = 0; i < CDInterfaces.size(); i++)
{
TOC toc;
TOC toc;
TOC_Clear(&toc);
CDInterfaces[i]->ReadTOC(&toc);
CDInterfaces[i]->ReadTOC(&toc);
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "CD %d Layout:\n", i + 1);
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "CD %d Layout:\n", i + 1);
for(int32 track = toc.first_track; track <= toc.last_track; track++)
{
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "Track %2d, LBA: %6d %s\n", track, toc.tracks[track].lba, (toc.tracks[track].control & 0x4) ? "DATA" : "AUDIO");
}
for(int32 track = toc.first_track; track <= toc.last_track; track++)
{
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "Track %2d, LBA: %6d %s\n", track, toc.tracks[track].lba, (toc.tracks[track].control & 0x4) ? "DATA" : "AUDIO");
}
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "Leadout: %6d\n", toc.tracks[100].lba);
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "Leadout: %6d\n", toc.tracks[100].lba);
}
// Calculate layout MD5. The system emulation LoadCD() code is free to ignore this value and calculate
@ -2749,6 +2751,7 @@ MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
{
CD_TOC toc;
TOC_Clear(&toc);
CDInterfaces[i]->ReadTOC(&toc);
layout_md5.update_u32_as_lsb(toc.first_track);

2
mednafen/cdrom/CDAccess_CCD.cpp
View File

@ -74,8 +74,8 @@ CDAccess_CCD::CDAccess_CCD(const char *path, bool image_memcache) : img_stream(N
{
try
{
Load(path, image_memcache);
TOC_Clear(&tocd);
Load(path, image_memcache);
}
catch(...)
{