summaryrefslogtreecommitdiff
path: root/EdkNt32Pkg
diff options
context:
space:
mode:
authorxgu3 <xgu3@6f19259b-4bc3-4df7-8a09-765794883524>2007-01-16 02:57:57 +0000
committerxgu3 <xgu3@6f19259b-4bc3-4df7-8a09-765794883524>2007-01-16 02:57:57 +0000
commit2bbf72b0ab9da75b2f980ee69e2b6356ecf130b7 (patch)
tree42ffa4ebb5d189bf384240f22a6f9de010c41218 /EdkNt32Pkg
parentad2baeff2209aa6161b90bf6f4e8454f1692f892 (diff)
downloadedk2-2bbf72b0ab9da75b2f980ee69e2b6356ecf130b7.zip
edk2-2bbf72b0ab9da75b2f980ee69e2b6356ecf130b7.tar.gz
edk2-2bbf72b0ab9da75b2f980ee69e2b6356ecf130b7.tar.bz2
Fix the issues,
1. NULL Pointer Errors in Variable.c 2. consoleoption Null Ptr Error 3. bootmaint Null Ptr Error 4. EFIAPI missing Crc32SectionExtraction.c git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2252 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkNt32Pkg')
-rw-r--r--EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c3
-rw-r--r--EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c1
-rw-r--r--EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 6eefa0b..2f90e3c 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
@@ -449,6 +449,7 @@ Returns:
Index2 = (UINT16) (KeyValue - HANDLE_OPTION_OFFSET);
NewMenuEntry = BOpt_GetMenuEntry (&DriverMenu, Index2);
+ ASSERT (NewMenuEntry != NULL);
Private->HandleContext = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;
CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);
@@ -556,6 +557,8 @@ Returns:
case FORM_CON_COM_ID:
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Private->CurrentTerminal);
+ ASSERT (NewMenuEntry != NULL);
+
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
NewTerminalContext->BaudRateIndex = CurrentFakeNVMap->COMBaudRate;
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index c77fa0a..7a62765 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -175,6 +175,7 @@ ChangeVariableDevicePath (
&TerminalMenu,
Com
);
+ ASSERT (NewMenuEntry != NULL);
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
Uart = (UART_DEVICE_PATH *) Node;
CopyMem (
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
index 88955c7..cac68a1 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
@@ -450,6 +450,7 @@ Var_UpdateConsoleOption (
NewTerminalContext->DevicePath,
(EFI_DEVICE_PATH_PROTOCOL *) &Vendor
);
+ ASSERT (TerminalDevicePath != NULL);
ChangeTerminalDevicePath (TerminalDevicePath, TRUE);
Temp = DevicePathToStr (TerminalDevicePath);
ConDevicePath = AppendDevicePathInstance (