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

Consider reading dump hardware blocks that strings are NUL-terminated.

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-20 00:39:53 +01:00
parent 6ec945203b
commit 542cc58eba
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blocks/dump.c
View File

@@ -61,19 +61,19 @@ static void reset_dump_hardware_context(aaruformat_context *ctx)
memset(&ctx->dump_hardware_header, 0, sizeof(ctx->dump_hardware_header)); memset(&ctx->dump_hardware_header, 0, sizeof(ctx->dump_hardware_header));
} }
static bool read_dump_string(FILE *stream, const char *field_name, uint32_t length, uint32_t *remaining, static bool read_dump_string(FILE *stream, const char *field_name, const uint32_t length, uint32_t *remaining,
uint8_t **destination) uint8_t **destination)
{ {
if(length == 0) return true; if(length == 0) return true;
if(remaining == NULL || *remaining < length) if(*remaining < length)
{ {
TRACE("Dump hardware %s length %u exceeds remaining payload %u", field_name, length, TRACE("Dump hardware %s length %u exceeds remaining payload %u", field_name, length,
remaining == NULL ? 0 : *remaining); remaining == NULL ? 0 : *remaining);
return false; return false;
} }
uint8_t *buffer = (uint8_t *)malloc((size_t)length + 1); uint8_t *buffer = malloc(length);
if(buffer == NULL) if(buffer == NULL)
{ {
@@ -81,7 +81,7 @@ static bool read_dump_string(FILE *stream, const char *field_name, uint32_t leng
return false; return false;
} }
size_t bytes_read = fread(buffer, 1, length, stream); const size_t bytes_read = fread(buffer, 1, length, stream);
if(bytes_read != length) if(bytes_read != length)
{ {
@@ -90,7 +90,6 @@ static bool read_dump_string(FILE *stream, const char *field_name, uint32_t leng
return false; return false;
} }
buffer[length] = 0;
*remaining -= length; *remaining -= length;
*destination = buffer; *destination = buffer;
@@ -125,7 +124,7 @@ void process_dumphw_block(aaruformat_context *ctx, const IndexEntry *entry)
return; return;
} }
if(fseek(ctx->imageStream, (long)entry->offset, SEEK_SET) < 0 || ftell(ctx->imageStream) != entry->offset) if(fseek(ctx->imageStream, entry->offset, SEEK_SET) < 0 || ftell(ctx->imageStream) != entry->offset)
{ {
FATAL("Could not seek to %" PRIu64 " as indicated by index entry...", entry->offset); FATAL("Could not seek to %" PRIu64 " as indicated by index entry...", entry->offset);
reset_dump_hardware_context(ctx); reset_dump_hardware_context(ctx);
@@ -166,7 +165,7 @@ void process_dumphw_block(aaruformat_context *ctx, const IndexEntry *entry)
if(payload_length > 0) if(payload_length > 0)
{ {
uint8_t *payload = (uint8_t *)malloc(payload_length); uint8_t *payload = malloc(payload_length);
if(payload == NULL) if(payload == NULL)
{ {
@@ -230,8 +229,7 @@ void process_dumphw_block(aaruformat_context *ctx, const IndexEntry *entry)
return; return;
} }
DumpHardwareEntriesWithData *entries = DumpHardwareEntriesWithData *entries = calloc(header.entries, sizeof(DumpHardwareEntriesWithData));
(DumpHardwareEntriesWithData *)calloc(header.entries, sizeof(DumpHardwareEntriesWithData));
if(entries == NULL) if(entries == NULL)
{ {