lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-31 16:31:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SETUPLIB] Fix system partition selection DPRINTs (#8336)

Browse Source 
Some partition entries (such as those added by the CreateInsertBlankRegion function) may not have their Volume member allocated. This fixes the USETUP crash when such partitions are handled.
This commit is contained in:
Adam Słaboń
2025-08-14 17:40:52 +02:00
committed by GitHub
parent dc97a4d380
commit 8ecfbb3a8c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
base/setup/lib/utils/partlist.c
View File

@@ -3438,7 +3438,8 @@ UseAlternativeDisk:
DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %C\n",
CandidatePartition->PartitionNumber,
CandidatePartition->DiskEntry->DiskNumber,
!CandidatePartition->Volume->Info.DriveLetter ? L'-' : CandidatePartition->Volume->Info.DriveLetter);
(!CandidatePartition->Volume || !CandidatePartition->Volume->Info.DriveLetter) ?
L'-' : CandidatePartition->Volume->Info.DriveLetter);
/* Return the candidate system partition */
return CandidatePartition;
@@ -3478,7 +3479,8 @@ UseAlternativeDisk:
DPRINT1("Use first active system partition %lu in disk %lu, drive letter %C\n",
CandidatePartition->PartitionNumber,
CandidatePartition->DiskEntry->DiskNumber,
!CandidatePartition->Volume->Info.DriveLetter ? L'-' : CandidatePartition->Volume->Info.DriveLetter);
(!CandidatePartition->Volume || !CandidatePartition->Volume->Info.DriveLetter) ?
L'-' : CandidatePartition->Volume->Info.DriveLetter);
/* Return the candidate system partition */
return CandidatePartition;
@@ -3516,7 +3518,8 @@ UseAlternativePartition:
DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %C\n",
CandidatePartition->PartitionNumber,
CandidatePartition->DiskEntry->DiskNumber,
!CandidatePartition->Volume->Info.DriveLetter ? L'-' : CandidatePartition->Volume->Info.DriveLetter);
(!CandidatePartition->Volume || !CandidatePartition->Volume->Info.DriveLetter) ?
L'-' : CandidatePartition->Volume->Info.DriveLetter);
/* Return the candidate system partition */
return CandidatePartition;