diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 59ad7843c46..09b2d81d3bf 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -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;