From d12c6a78aaa2d5bb841733f9c758821875d07dae Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 23 Sep 2011 07:44:49 +0000
Subject: error handling enhancement for possible null pointer dereference

Signed-off-by: erictian
Reviewed-by: ydong10

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12437 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'MdeModulePkg/Bus/Usb/UsbKbDxe')

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 000430ae78..fe6121985c 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -627,13 +627,18 @@ SetKeyboardLayoutEvent (
     //
     KeyCode = EfiKeyToUsbKeyCodeConvertionTable [(UINT8) (TempKey.Key)];
     TableEntry = GetKeyDescriptor (UsbKeyboardDevice, KeyCode);
+    if (TableEntry == NULL) {
+      ReleaseKeyboardLayoutResources (UsbKeyboardDevice);
+      FreePool (KeyboardLayout);
+      return;
+    }
     CopyMem (TableEntry, KeyDescriptor, sizeof (EFI_KEY_DESCRIPTOR));
 
     //
     // For non-spacing key, create the list with a non-spacing key followed by physical keys.
     //
     if (TempKey.Modifier == EFI_NS_KEY_MODIFIER) {
-      UsbNsKey = AllocatePool (sizeof (USB_NS_KEY));
+      UsbNsKey = AllocateZeroPool (sizeof (USB_NS_KEY));
       ASSERT (UsbNsKey != NULL);
 
       //
-- 
cgit v1.2.3