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

Enhance aaruf_set_tracks function to manage data tracks with memory allocation and error handling

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-03 13:39:57 +01:00
parent c049185185
commit 7d7a546ede
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/blocks/optical.c
View File

@@ -317,7 +317,6 @@ int32_t aaruf_get_tracks(const void *context, uint8_t *buffer, size_t *length)
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
} }
/** /**
* @brief Replace (or clear) the in-memory track table for an AaruFormat image context. * @brief Replace (or clear) the in-memory track table for an AaruFormat image context.
* *
@@ -438,6 +437,42 @@ int32_t aaruf_set_tracks(void *context, TrackEntry *tracks, const int count)
memcpy(ctx->trackEntries, tracks, sizeof(TrackEntry) * count); memcpy(ctx->trackEntries, tracks, sizeof(TrackEntry) * count);
ctx->tracksHeader.crc64 = aaruf_crc64_data((const uint8_t *)ctx->trackEntries, sizeof(TrackEntry) * count); ctx->tracksHeader.crc64 = aaruf_crc64_data((const uint8_t *)ctx->trackEntries, sizeof(TrackEntry) * count);
ctx->imageInfo.HasPartitions = true;
ctx->imageInfo.HasSessions = true;
free(ctx->dataTracks);
ctx->numberOfDataTracks = 0;
for(int j = 0; j < ctx->tracksHeader.entries; j++)
if(ctx->trackEntries[j].sequence > 0 && ctx->trackEntries[j].sequence <= 99) ctx->numberOfDataTracks++;
if(ctx->numberOfDataTracks > 0)
{
ctx->dataTracks = malloc(sizeof(TrackEntry) * ctx->numberOfDataTracks);
if(ctx->dataTracks == NULL)
{
free(ctx->trackEntries);
ctx->trackEntries = NULL;
memset(&ctx->tracksHeader, 0, sizeof(TracksHeader));
FATAL("Could not allocate memory for data tracks");
TRACE("Exiting aaruf_set_tracks() = AARUF_ERROR_NOT_ENOUGH_MEMORY");
return AARUF_ERROR_NOT_ENOUGH_MEMORY;
}
}
else
ctx->dataTracks = NULL;
if(ctx->dataTracks != NULL)
{
int k = 0;
for(int j = 0; j < ctx->tracksHeader.entries; j++)
if(ctx->trackEntries[j].sequence > 0 && ctx->trackEntries[j].sequence <= 99)
memcpy(&ctx->dataTracks[k++], &ctx->trackEntries[j], sizeof(TrackEntry));
}
TRACE("Exiting aaruf_set_tracks() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_set_tracks() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
} }