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

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
index dc7ed07baa2eea40cb851379c6130e2f23d54201..143836be8209b2ec363e57eeb0ffc1b38996e38e 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
@@ -28,12 +28,14 @@ Abstract:
 #include <Crc32SectionExtract.h>\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 InitializeCrc32GuidedSectionExtractionProtocol (\r
   IN EFI_HANDLE                   ImageHandle,\r
   IN EFI_SYSTEM_TABLE             *SystemTable\r
   );\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 InitializeCrc32GuidedSectionExtractionProtocol (\r
   IN EFI_HANDLE                   ImageHandle,\r
   IN EFI_SYSTEM_TABLE             *SystemTable\r
@@ -98,6 +100,7 @@ Returns:
 \r
 STATIC\r
 UINT32\r
+EFIAPI\r
 GetSectionLength (\r
   IN EFI_COMMON_SECTION_HEADER  *CommonHeader\r
   )\r
@@ -126,6 +129,7 @@ GetSectionLength (
 \r
 STATIC\r
 EFI_STATUS\r
+EFIAPI\r
 Crc32ExtractSection (\r
   IN  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  *This,\r
   IN  VOID                                    *InputSection,\r

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
index 8e32d6d7bb991f0e416fe61b85e0185dc7272de7..de2bb3a80a7740a4190047938d6ebec085d73e08 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
@@ -34,6 +34,7 @@ typedef struct {
 //\r
 STATIC\r
 EFI_STATUS\r
+EFIAPI\r
 Crc32ExtractSection (\r
   IN  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  *This,\r
   IN  VOID                                    *InputSection,\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 6eefa0bd30b3ecee315da40e8aa9098c9a2b6a71..2f90e3c6b271198c34d71a982495167f2a46e4f6 100644 (file)
--- 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);\r
 \r
       NewMenuEntry            = BOpt_GetMenuEntry (&DriverMenu, Index2);\r
+      ASSERT (NewMenuEntry != NULL);\r
       Private->HandleContext  = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;\r
 \r
       CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);\r
@@ -556,6 +557,8 @@ Returns:
   case FORM_CON_COM_ID:\r
     NewMenuEntry                      = BOpt_GetMenuEntry (&TerminalMenu, Private->CurrentTerminal);\r
 \r
+    ASSERT (NewMenuEntry != NULL);\r
+\r
     NewTerminalContext                = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
 \r
     NewTerminalContext->BaudRateIndex = CurrentFakeNVMap->COMBaudRate;\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index c77fa0a351eda1fe28981ffbbc278a49151f9e96..7a62765fcdb9670586ecb1d23b018b4d1de66297 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -175,6 +175,7 @@ ChangeVariableDevicePath (
                       &TerminalMenu,\r
                       Com\r
                       );\r
+      ASSERT (NewMenuEntry != NULL);\r
       NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
       Uart                = (UART_DEVICE_PATH *) Node;\r
       CopyMem (\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
index 88955c730d6179e1e6652b41f70caf741ea14113..cac68a16b061ab174477df80a0b1880ba77e4a1f 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
@@ -450,6 +450,7 @@ Var_UpdateConsoleOption (
                             NewTerminalContext->DevicePath,\r
                             (EFI_DEVICE_PATH_PROTOCOL *) &Vendor\r
                             );\r
+      ASSERT (TerminalDevicePath != NULL);\r
       ChangeTerminalDevicePath (TerminalDevicePath, TRUE);\r
       Temp = DevicePathToStr (TerminalDevicePath);\r
       ConDevicePath = AppendDevicePathInstance (\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index 297c2cfc5531e0cb1b63c2a93c8b17391695a4fa..9acacc8e72087d470df6a94c2a441f6999f1fe78 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -175,6 +175,7 @@ ChangeVariableDevicePath (
                       &TerminalMenu,\r
                       Com\r
                       );\r
+      ASSERT (NewMenuEntry != NULL);\r
       NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
       Uart                = (UART_DEVICE_PATH *) Node;\r
       CopyMem (\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
index c660e409db8520ac268ee46023549778b6784b7d..454d192a2b5e76826a5a0961abe492a24883ac3c 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
@@ -450,6 +450,7 @@ Var_UpdateConsoleOption (
                             NewTerminalContext->DevicePath,\r
                             (EFI_DEVICE_PATH_PROTOCOL *) &Vendor\r
                             );\r
+      ASSERT (TerminalDevicePath != NULL);\r
       ChangeTerminalDevicePath (TerminalDevicePath, TRUE);\r
       Temp = DevicePathToStr (TerminalDevicePath);\r
       ConDevicePath = AppendDevicePathInstance (\r