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

When setting dump hardware consider that strings are already NUL-terminated.

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-20 00:40:27 +01:00
parent 542cc58eba
commit 0326c81a91
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/dump.c
View File

@@ -620,17 +620,20 @@ AARU_EXPORT int32_t AARU_CALL aaruf_set_dumphw(void *context, uint8_t *data, siz
size_t pos = sizeof(DumpHardwareHeader); size_t pos = sizeof(DumpHardwareHeader);
#define COPY_STRING_FIELD(field) \ #define COPY_STRING_FIELD(field) \
do { \ do { \
const size_t field##_length = copy[e].entry.field##Length; \ const size_t field##_length = copy[e].entry.field##Length; \
if(field##_length > 0) \ if(field##_length > 0) \
{ \ { \
if(field##_length > length - pos) goto invalid_data; \ if(field##_length > length - pos) goto invalid_data; \
copy[e].field = (uint8_t *)calloc(1, field##_length + 1); \ /* Allocate only field##_length bytes, since input is NUL-terminated */ \
if(copy[e].field == NULL) goto free_copy_and_error; \ copy[e].field = (uint8_t *)calloc(1, field##_length); \
memcpy(copy[e].field, data + pos, field##_length); \ if(copy[e].field == NULL) goto free_copy_and_error; \
pos += field##_length; \ memcpy(copy[e].field, data + pos, field##_length); \
} \ /* Ensure NUL-termination in case input is malformed */ \
copy[e].field[field##_length - 1] = '\0'; \
pos += field##_length; \
} \
} while(0) } while(0)
for(uint32_t e = 0; e < header.entries; e++) for(uint32_t e = 0; e < header.entries; e++)