Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-07 18:43:45 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix uninitialized partition type issue in 'mp gpt'

Browse Source
This commit is contained in:
pancake 2017-11-07 11:45:10 +01:00
parent bb406e201e
commit 0c81ce3651
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/fs/file.c
View File

@ -55,6 +55,7 @@ R_API RFSPartition* r_fs_partition_new(int num, ut64 start, ut64 length) {
return NULL;
}
p->number = num;
p->type = 0; // TODO we need an enum with all the partition types
p->start = start;
p->length = length;
return p;

3
libr/fs/fs.c
View File

@ -581,8 +581,9 @@ R_API RList* r_fs_partitions(RFS* fs, const char* ptype, ut64 delta) {
eprintf ("Unknown partition type '%s'.\n", ptype);
}
eprintf ("Supported types:\n");
for (i = 0; partitions[i].name; i++)
for (i = 0; partitions[i].name; i++) {
eprintf (" %s", partitions[i].name);
}
eprintf ("\n");
return NULL;
}

5
shlr/grub/partmap/gpt.c
View File

@ -84,12 +84,14 @@ gpt_partition_map_iterate (grub_disk_t disk,
sizeof (grub_gpt_partition_type_empty)))
{
/* Calculate the first block and the size of the partition. */
memset (&part, 0, sizeof (sizeof (struct grub_partition)));
part.start = grub_le_to_cpu64 (entry.start);
part.len = (grub_le_to_cpu64 (entry.end)
- grub_le_to_cpu64 (entry.start) + 1);
part.offset = entries;
part.number = i;
part.index = last_offset;
part.msdostype = 0; // TODO entry.type.data1;
part.partmap = &grub_gpt_partition_map;
grub_dprintf ("gpt", "GPT entry %d: start=%"PFMT64d", length=%"PFMT64d"\n", i,
@ -100,8 +102,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
}
last_offset += grub_le_to_cpu32 (gpt.partentry_size);
if (last_offset == GRUB_DISK_SECTOR_SIZE)
{
if (last_offset == GRUB_DISK_SECTOR_SIZE) {
last_offset = 0;
entries++;
}