libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix: Apple Partition Map entries wrote uninitialized data

Browse Source
This commit is contained in:
Thomas Schmitt 2020-11-13 19:02:07 +01:00
parent 1d5566f8bb
commit 7e3b01b53c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libisofs/system_area.c
View File

@ -1035,7 +1035,7 @@ int iso_quick_apm_entry(struct iso_apm_partition_request **req_array,
uint32_t start_block, uint32_t block_count, uint32_t start_block, uint32_t block_count,
char *name, char *type) char *name, char *type)
{ {
int ret; int ret, l;
struct iso_apm_partition_request *entry; struct iso_apm_partition_request *entry;
entry = calloc(1, sizeof(struct iso_apm_partition_request)); entry = calloc(1, sizeof(struct iso_apm_partition_request));
@ -1043,8 +1043,12 @@ int iso_quick_apm_entry(struct iso_apm_partition_request **req_array,
return ISO_OUT_OF_MEM; return ISO_OUT_OF_MEM;
entry->start_block = start_block; entry->start_block = start_block;
entry->block_count = block_count; entry->block_count = block_count;
memcpy((char *) entry->name, name, 32); memset((char *) entry->name, 0, 32);
memcpy((char *) entry->type, type, 32); for (l = 0; l < 32 && name[l] != 0; l++);
memcpy((char *) entry->name, name, l);
memset((char *) entry->type, 0, 32);
for (l = 0; l < 32 && type[l] != 0; l++);
memcpy((char *) entry->type, type, l);
entry->req_status = 0; entry->req_status = 0;
ret = iso_register_apm_entry(req_array, apm_req_count, entry, 0); ret = iso_register_apm_entry(req_array, apm_req_count, entry, 0);
free(entry); free(entry);