i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootloader/efi: remove partition before adding to new list.

Browse Source 
* A Node/Partition cannot be member of two lists at once. This
  resolves an issue where a partition cannot be found later
  due to corruption of a NodeList.
This commit is contained in:
Jessica Hamilton
2018-05-05 14:14:35 +12:00
parent bb96d47d9b
commit f599721237
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/efi/devices.cpp
+3 -1
View File
@@ -488,8 +488,10 @@ platform_get_boot_partitions(struct stage2_args *args, Node *bootDevice,
NodeIterator iterator = partitions->GetIterator(); NodeIterator iterator = partitions->GetIterator();
boot::Partition *partition = NULL; boot::Partition *partition = NULL;
while ((partition = (boot::Partition*)iterator.Next()) != NULL) { while ((partition = (boot::Partition*)iterator.Next()) != NULL) {
if (device_contains_partition((EfiDevice*)bootDevice, partition)) if (device_contains_partition((EfiDevice*)bootDevice, partition)) {
iterator.Remove();
bootPartitions->Insert(partition); bootPartitions->Insert(partition);
}
} }
return bootPartitions->Count() > 0 ? B_OK : B_ENTRY_NOT_FOUND; return bootPartitions->Count() > 0 ? B_OK : B_ENTRY_NOT_FOUND;