starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-13 01:44:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

CDImagePBP: Fix TOC misreporting for some images

Browse Source
This commit is contained in:
Stenzek
2025-11-27 01:09:35 +10:00
parent 6369f38d65
commit e142a321f2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/cd_image_pbp.cpp
View File

@@ -645,13 +645,13 @@ bool CDImagePBP::OpenDisc(u32 index, Error* error)
{
pregap_frames = userdata_start - pregap_start;
pregap_sector_size = track_sector_size;
if (is_first_track)
m_lba_count += pregap_frames;
}
if (is_first_track)
{
m_lba_count += pregap_frames;
track1_pregap_frames = pregap_frames;
}
Index pregap_index = {};
pregap_index.file_offset =
@@ -795,14 +795,19 @@ bool CDImagePBP::ReadSectorFromIndex(void* buffer, const Index& index, LBA lba_i
const u32 offset_in_block = offset_in_file % DECOMPRESSED_BLOCK_SIZE;
const u32 requested_block = offset_in_file / DECOMPRESSED_BLOCK_SIZE;
BlockInfo& bi = m_blockinfo_table[requested_block];
if (bi.size == 0) [[unlikely]]
if (requested_block >= m_blockinfo_table.size()) [[unlikely]]
{
ERROR_LOG("Invalid block {} requested", requested_block);
return false;
}
const BlockInfo& bi = m_blockinfo_table[requested_block];
if (bi.size == 0) [[unlikely]]
{
ERROR_LOG("Requested block {} has size 0", requested_block);
return false;
}
if (m_current_block != requested_block && !DecompressBlock(bi)) [[unlikely]]
{
ERROR_LOG("Failed to decompress block {}", requested_block);