From 261136bc32b456800f6dec7eedadea5b2a153eca Mon Sep 17 00:00:00 2001
From: hfang <hfang@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 23 Mar 2009 09:12:51 +0000
Subject: [PATCH] fix Klocwork issues

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7926 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c               | 10 ++++++----
 IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c        |  6 ++++++
 IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c      |  2 +-
 .../DxeReportStatusCodeLibFramework/DxeSupport.c       |  4 +++-
 .../PciIncompatibleDeviceSupportLib.c                  |  9 +++++++++
 .../PeiReportStatusCodeLib/ReportStatusCodeLib.c       |  4 +++-
 .../SmmRuntimeDxeSupport.c                             |  4 +++-
 7 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index b09193cee1..59c416628c 100644
--- 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,
   // exhaust input data just in case there is still keyboard data left
   //
-  Status1 = EFI_SUCCESS;
-  while (!EFI_ERROR (Status1)) {
-    Status1 = KeyboardRead (ConsoleIn, &Data);;
+  if (ConsoleIn != NULL) {
+    Status1 = EFI_SUCCESS;
+    while (!EFI_ERROR (Status1)) {
+      Status1 = KeyboardRead (ConsoleIn, &Data);;
+    }
   }
-
+  
   if (ConsoleIn != NULL) {
     gBS->FreePool (ConsoleIn);
   }
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 4a57f11bfe..25ecedb78b 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -63,6 +63,9 @@ ATAIdentify (
   //  the ATA Identify command
   //
   AtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));
+  if (AtaIdentifyPointer == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
 
   //
   //  use ATA PIO Data In protocol to send ATA Identify command
@@ -1824,6 +1827,9 @@ AtaSMARTSupport (
     // Detect if this feature is enabled
     //
     TmpAtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));
+    if (TmpAtaIdentifyPointer == NULL) {
+      return;
+    }
 
     DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);
     Status = AtaPioDataIn (
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
index e3515d2547..1f989e72f6 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
@@ -1791,7 +1791,7 @@ AtapiBlkIoReadBlocks (
   //
   if (LBA == 0 && (IdeBlkIoDevice->Cache == NULL)) {
     IdeBlkIoDevice->Cache = AllocatePool (BlockSize);
-    if (IdeBlkIoDevice != NULL) {
+    if (IdeBlkIoDevice->Cache!= NULL) {
       CopyMem ((UINT8 *) IdeBlkIoDevice->Cache, (UINT8 *) Buffer, BlockSize);
     }
   }
diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
index 602e42b182..bfa5e51305 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeSupport.c
@@ -125,7 +125,9 @@ InternalReportStatusCodeEx (
   //
   // Fill in the extended data buffer
   //
-  CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  if (ExtendedData != NULL) {
+    CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  }
 
   //
   // Report the status code
diff --git a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
index 08c95b6526..61a936de12 100644
--- a/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
+++ b/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.c
@@ -137,6 +137,9 @@ PciResourceUpdateCheck (
       AcpiPtr = AllocateZeroPool (
                   sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) * Index + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR)
                 );
+      if (AcpiPtr == NULL) {
+        return EFI_OUT_OF_RESOURCES;
+      }
 
       OldAcpiPtr = AcpiPtr;
 
@@ -255,6 +258,9 @@ PciRegisterUpdateCheck (
 
             Dsc = (EFI_PCI_REGISTER_VALUE_DATA *) (ListPtr + 2);
             RegisterPtr = AllocateZeroPool (sizeof (EFI_PCI_REGISTER_VALUE_DATA));
+            if (RegisterPtr == NULL) {
+              return EFI_SUCCESS;
+            }
 
             RegisterPtr->AndValue      = Dsc->AndValue;
             RegisterPtr->OrValue       = Dsc->OrValue;
@@ -356,6 +362,9 @@ PciRegisterAccessCheck (
           if((Dsc->StartOffset <= Offset) && (Dsc->EndOffset > Offset)) {
 
             RegisterPtr = AllocateZeroPool (sizeof (EFI_PCI_REGISTER_ACCESS_DATA));
+            if (RegisterPtr == NULL) {
+              return EFI_OUT_OF_RESOURCES;
+            }
 
             RegisterPtr->StartOffset      = Dsc->StartOffset;
             RegisterPtr->EndOffset        = Dsc->EndOffset;
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index d027dc4a8e..4f0901b1d2 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -471,7 +471,9 @@ ReportStatusCodeEx (
     ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid;
   }
   CopyGuid (&StatusCodeData->Type, ExtendedDataGuid);
-  CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  if (ExtendedData != NULL) {
+    CopyMem (StatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  }
   if (CallerId == NULL) {
     CallerId = &gEfiCallerIdGuid;
   }
diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
index c680160831..e176ecc36b 100644
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
@@ -292,7 +292,9 @@ InternalReportStatusCodeEx (
   //
   // Fill in the extended data buffer
   //
-  CopyMem (mStatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  if (ExtendedData != NULL) {
+    CopyMem (mStatusCodeData + 1, ExtendedData, ExtendedDataSize);
+  }
 
   //
   // Report the status code
-- 
2.39.2