aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling for fseek in aaruf_read_sector to improve robustness

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-08 19:33:36 +01:00
parent fc4fe2d69d
commit 38efda2a50
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/read.c
View File

@@ -357,7 +357,15 @@ int32_t aaruf_read_sector(void *context, const uint64_t sector_address, bool neg
} }
TRACE("Reading block header"); TRACE("Reading block header");
fseek(ctx->imageStream, block_offset, SEEK_SET); if(fseek(ctx->imageStream, block_offset, SEEK_SET) != 0)
{
FATAL("Could not seek to block header");
free(block_header);
TRACE("Exiting aaruf_read_sector() = AARUF_ERROR_CANNOT_READ_HEADER");
return AARUF_ERROR_CANNOT_READ_HEADER;
}
read_bytes = fread(block_header, 1, sizeof(BlockHeader), ctx->imageStream); read_bytes = fread(block_header, 1, sizeof(BlockHeader), ctx->imageStream);
if(read_bytes != sizeof(BlockHeader)) if(read_bytes != sizeof(BlockHeader))
@@ -371,8 +379,13 @@ int32_t aaruf_read_sector(void *context, const uint64_t sector_address, bool neg
TRACE("Adding block header to cache"); TRACE("Adding block header to cache");
add_to_cache_uint64(&ctx->blockHeaderCache, block_offset, block_header); add_to_cache_uint64(&ctx->blockHeaderCache, block_offset, block_header);
} }
else else if(fseek(ctx->imageStream, block_offset + sizeof(BlockHeader), SEEK_SET) != 0)
fseek(ctx->imageStream, block_offset + sizeof(BlockHeader), SEEK_SET); // Advance as if reading the header {
FATAL("Could not seek past cached block header");
TRACE("Exiting aaruf_read_sector() = AARUF_ERROR_CANNOT_READ_HEADER");
return AARUF_ERROR_CANNOT_READ_HEADER;
}
if(data == NULL || *length < block_header->sectorSize) if(data == NULL || *length < block_header->sectorSize)
{ {