diff options
3 files changed, 35 insertions, 26 deletions
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c index b35e938..393091f 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c @@ -379,6 +379,7 @@ ExtractFileNameFromDevicePath ( String = UiDevicePathToStr(DevicePath);
MatchString = String;
LastMatch = String;
+ FileName = NULL;
while(MatchString != NULL){
LastMatch = MatchString + 1;
@@ -387,7 +388,9 @@ ExtractFileNameFromDevicePath ( Length = StrLen(LastMatch);
FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);
- *(FileName + Length) = 0;
+ if (FileName != NULL) {
+ *(FileName + Length) = 0;
+ }
FreePool(String);
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c index c660c73..890728a 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c @@ -865,29 +865,33 @@ BootFromFile ( EFI_BOOT_MANAGER_LOAD_OPTION BootOption;
CHAR16 *FileName;
+ FileName = NULL;
+
FileName = ExtractFileNameFromDevicePath(FilePath);
- EfiBootManagerInitializeLoadOption (
- &BootOption,
- 0,
- LoadOptionTypeBoot,
- LOAD_OPTION_ACTIVE,
- FileName,
- FilePath,
- NULL,
- 0
- );
- //
- // Since current no boot from removable media directly is allowed */
- //
- gST->ConOut->ClearScreen (gST->ConOut);
+ if (FileName != NULL) {
+ EfiBootManagerInitializeLoadOption (
+ &BootOption,
+ 0,
+ LoadOptionTypeBoot,
+ LOAD_OPTION_ACTIVE,
+ FileName,
+ FilePath,
+ NULL,
+ 0
+ );
+ //
+ // Since current no boot from removable media directly is allowed */
+ //
+ gST->ConOut->ClearScreen (gST->ConOut);
- BmmSetConsoleMode (FALSE);
- EfiBootManagerBoot (&BootOption);
- BmmSetConsoleMode (TRUE);
+ BmmSetConsoleMode (FALSE);
+ EfiBootManagerBoot (&BootOption);
+ BmmSetConsoleMode (TRUE);
- FreePool(FileName);
+ FreePool(FileName);
- EfiBootManagerFreeLoadOption (&BootOption);
+ EfiBootManagerFreeLoadOption (&BootOption);
+ }
return FALSE;
}
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c index 13a29db..9e79826 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c @@ -1,7 +1,7 @@ /** @file
Dynamically update the pages.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -1020,17 +1020,19 @@ UpdateOptionPage( CHAR16 *String;
EFI_STRING_ID StringToken;
+ String = NULL;
+
if (DevicePath != NULL){
String = ExtractFileNameFromDevicePath(DevicePath);
- StringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, String, NULL);
- FreePool(String);
- } else {
+ }
+ if (String == NULL) {
String = HiiGetString (CallbackData->BmmHiiHandle, STRING_TOKEN (STR_NULL_STRING), NULL);
ASSERT (String != NULL);
- StringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, String, NULL);
- FreePool (String);
}
+ StringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, String, NULL);
+ FreePool (String);
+
if(FormId == FORM_BOOT_ADD_ID){
if (!CallbackData->BmmFakeNvData.BootOptionChanged) {
ZeroMem (CallbackData->BmmFakeNvData.BootOptionalData, sizeof (CallbackData->BmmFakeNvData.BootOptionalData));
|