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: fix Klocwork issues

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7926 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c | 10 ++++++----
 IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c              |  6 ++++++
 IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c            |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'IntelFrameworkModulePkg/Bus')

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);
     }
   }
-- 
cgit v1.2.3