aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2026-07-08 18:06:18 +00:00
Code Issues 3 Packages Projects Releases Wiki Activity

Merge pull request #25 from RomTholos/fix/mode2-form-detection-read

Browse Source 
fix Mode 2 form detection in errored-suffix read path
This commit is contained in:
Natalia Portillo
2026-04-01 16:03:02 +01:00
committed by GitHub
parent 3cc1830a5f b88e71a865
commit 6fa129282b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/read.c
View File

@@ -1855,8 +1855,8 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_long(void *context, const uint64
else
{
// Mode 2 where ECC/EDC failed — restore user data + stored suffix.
// Check subheader (already copied to data+16) to determine form.
if(data[0x12] & 0x20)
// Check both subheader copies to match write path form detection.
if((data[0x12] & 0x20) || (data[0x16] & 0x20))
{
// Form 2: 2324 bytes user data, 4 bytes EDC suffix
memcpy(data + 24, bare_data, 2324);
@@ -1893,9 +1893,10 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_long(void *context, const uint64
else
{
// Mode 2 where ECC/EDC failed — restore user data + stored suffix.
// Check both subheader copies to match write path form detection.
const uint32_t sfx_index =
(ctx->sector_suffix_ddt[corrected_sector_address] & CD_DFIX_MASK) - 1;
if(data[0x12] & 0x20)
if((data[0x12] & 0x20) || (data[0x16] & 0x20))
{
memcpy(data + 24, bare_data, 2324);
memcpy(data + 2348, ctx->sector_suffix_corrected + sfx_index * 288, 4);