system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 08:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibPartition: Fix end block off by one error

Browse source 
Previously, end block was inconsistent. GUIDPartitionTable treated
end block as an inclusive bound, while MBRPartitionTable and
EBRPartitionTable treated end block as an exclusive bound.
Now all three treat end block as an inclusive upper bound.
This commit is contained in:
Samuel Bowman 2022-06-28 19:06:05 -04:00 committed by Linus Groh
parent fb4221ad52
commit 2f8c20816e
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Userland/Applications/PartitionEditor/PartitionModel.cpp
View file

@ -42,9 +42,6 @@ GUI::Variant PartitionModel::data(GUI::ModelIndex const& index, GUI::ModelRole r
case Column::StartBlock:
return partition.start_block();
case Column::EndBlock:
// FIXME: Either MBR end block is off by one (if supposed to be exclusive bound)
// or GPT end block is off by one (if supposed to be inclusive bound).
// This is an issue in LibPartition.
return partition.end_block();
default:
VERIFY_NOT_REACHED();

2
Userland/Libraries/LibPartition/EBRPartitionTable.cpp
View file

@ -77,7 +77,7 @@ EBRPartitionTable::EBRPartitionTable(NonnullRefPtr<Core::File> device)
if (entry.offset == 0x00) {
continue;
}
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length), entry.type));
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length) - 1, entry.type));
}
}

4
Userland/Libraries/LibPartition/MBRPartitionTable.cpp
View file

@ -82,7 +82,7 @@ MBRPartitionTable::MBRPartitionTable(NonnullRefPtr<Core::File> device_file, u32
if (entry.offset == 0x00) {
continue;
}
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length), entry.type));
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length) - 1, entry.type));
}
m_valid = true;
}
@ -106,7 +106,7 @@ MBRPartitionTable::MBRPartitionTable(NonnullRefPtr<Core::File> device_file)
if (entry.offset == 0x00) {
continue;
}
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length), entry.type));
MUST(m_partitions.try_empend(entry.offset, (entry.offset + entry.length) - 1, entry.type));
}
m_valid = true;
}