fix Klocwork issues

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7926 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index b09193cee18a767b3f381d9c40a18a34ad767007..59c416628cbd69a7f4696e5e46f83da1dd334d85 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -353,11 +353,13 @@ ErrorExit:
   // Since there will be no timer handler for keyboard input any more,\r
   // exhaust input data just in case there is still keyboard data left\r
   //\r
-  Status1 = EFI_SUCCESS;\r
-  while (!EFI_ERROR (Status1)) {\r
-    Status1 = KeyboardRead (ConsoleIn, &Data);;\r
+  if (ConsoleIn != NULL) {\r
+    Status1 = EFI_SUCCESS;\r
+    while (!EFI_ERROR (Status1)) {\r
+      Status1 = KeyboardRead (ConsoleIn, &Data);;\r
+    }\r
   }\r
-\r
+  \r
   if (ConsoleIn != NULL) {\r
     gBS->FreePool (ConsoleIn);\r
   }\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 4a57f11bfea05ba34cbedfeac573ded43bb7e217..25ecedb78b1e6144c4b5c21d1eeb0487b2094c83 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -63,6 +63,9 @@ ATAIdentify (
   //  the ATA Identify command\r
   //\r
   AtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));\r
+  if (AtaIdentifyPointer == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
 \r
   //\r
   //  use ATA PIO Data In protocol to send ATA Identify command\r
@@ -1824,6 +1827,9 @@ AtaSMARTSupport (
     // Detect if this feature is enabled\r
     //\r
     TmpAtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));\r
+    if (TmpAtaIdentifyPointer == NULL) {\r
+      return;\r
+    }\r
 \r
     DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);\r
     Status = AtaPioDataIn (\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
index e3515d254769cfa7db2faed0fc2b22e01ee77ecf..1f989e72f67dd239865f88942ff3a911fe8ed662 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
@@ -1791,7 +1791,7 @@ AtapiBlkIoReadBlocks (
   //\r
   if (LBA == 0 && (IdeBlkIoDevice->Cache == NULL)) {\r
     IdeBlkIoDevice->Cache = AllocatePool (BlockSize);\r
-    if (IdeBlkIoDevice != NULL) {\r
+    if (IdeBlkIoDevice->Cache!= NULL) {\r
       CopyMem ((UINT8 *) IdeBlkIoDevice->Cache, (UINT8 *) Buffer, BlockSize);\r
     }\r
   }\r

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
index 602e42b1824298d0b0a175febb3bd291cfbc87c0..bfa5e513056218ea141434e7963e31f1f5f167d6 100644 (file)
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
@@ -125,7 +125,9 @@ InternalReportStatusCodeEx (
   //\r
   // Fill in the extended data buffer\r
   //\r
-  CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  if (ExtendedData != NULL) {\r
+    CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  }\r
 \r
   //\r
   // Report the status code\r

diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
index 08c95b65261394bc3cb5f61e2b59d11f78ebff2e..61a936de1291e9aec6cd7b41fcdf0ae4e463544c 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
@@ -137,6 +137,9 @@ PciResourceUpdateCheck (
       AcpiPtr = AllocateZeroPool (\r
                   sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) * Index + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR)\r
                 );\r
+      if (AcpiPtr == NULL) {\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
 \r
       OldAcpiPtr = AcpiPtr;\r
 \r
@@ -255,6 +258,9 @@ PciRegisterUpdateCheck (
 \r
             Dsc = (EFI_PCI_REGISTER_VALUE_DATA *) (ListPtr + 2);\r
             RegisterPtr = AllocateZeroPool (sizeof (EFI_PCI_REGISTER_VALUE_DATA));\r
+            if (RegisterPtr == NULL) {\r
+              return EFI_SUCCESS;\r
+            }\r
 \r
             RegisterPtr->AndValue      = Dsc->AndValue;\r
             RegisterPtr->OrValue       = Dsc->OrValue;\r
@@ -356,6 +362,9 @@ PciRegisterAccessCheck (
           if((Dsc->StartOffset <= Offset) && (Dsc->EndOffset > Offset)) {\r
 \r
             RegisterPtr = AllocateZeroPool (sizeof (EFI_PCI_REGISTER_ACCESS_DATA));\r
+            if (RegisterPtr == NULL) {\r
+              return EFI_OUT_OF_RESOURCES;\r
+            }\r
 \r
             RegisterPtr->StartOffset      = Dsc->StartOffset;\r
             RegisterPtr->EndOffset        = Dsc->EndOffset;\r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index d027dc4a8e9e5b0ab99c8abd099ac24652536b3f..4f0901b1d2b629cd24d722fb93490f211849d453 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -471,7 +471,9 @@ ReportStatusCodeEx (
     ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid;\r
   }\r
   CopyGuid (&StatusCodeData->Type, ExtendedDataGuid);\r
-  CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  if (ExtendedData != NULL) {\r
+    CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  }\r
   if (CallerId == NULL) {\r
     CallerId = &gEfiCallerIdGuid;\r
   }\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
index c68016083137bea2a26a27bca4154f8fb0f01993..e176ecc36b01bb021ca05d0453432e9554547015 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
@@ -292,7 +292,9 @@ InternalReportStatusCodeEx (
   //\r
   // Fill in the extended data buffer\r
   //\r
-  CopyMem (mStatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  if (ExtendedData != NULL) {\r
+    CopyMem (mStatusCodeData + 1, ExtendedData, ExtendedDataSize);\r
+  }\r
 \r
   //\r
   // Report the status code\r