sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the potential issue that using integrate as BOOLEAN value in judgment.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8648 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2
2009-06-24 08:41:14 +00:00
parent 9260b9151b
commit 7ec9caab92
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
View File

@@ -337,7 +337,7 @@ EfiDevicePathInstanceCount (
UINTN Size;
Count = 0;
while (GetNextDevicePathInstance (&DevicePath, &Size)) {
while (GetNextDevicePathInstance (&DevicePath, &Size) != NULL) {
Count += 1;
}

8
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
View File

@@ -586,7 +586,7 @@ BOpt_FindFiles (
return EFI_NOT_FOUND;
}
if (!(DirInfo->Attribute & EFI_FILE_DIRECTORY)) {
if ((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {
return EFI_INVALID_PARAMETER;
}
@@ -614,8 +614,8 @@ BOpt_FindFiles (
break;
}
if ((DirInfo->Attribute & EFI_FILE_DIRECTORY && Pass == 2) ||
(!(DirInfo->Attribute & EFI_FILE_DIRECTORY) && Pass == 1)
if (((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0 && Pass == 2) ||
((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0 && Pass == 1)
) {
//
// Pass 1 is for Directories
@@ -624,7 +624,7 @@ BOpt_FindFiles (
continue;
}
if (!(BOpt_IsEfiImageName (DirInfo->FileName) || DirInfo->Attribute & EFI_FILE_DIRECTORY)) {
if (!(BOpt_IsEfiImageName (DirInfo->FileName) || (DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0)) {
//
// Slip file unless it is a directory entry or a .EFI file
//