diff options
| author | erictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-23 05:17:31 +0000 |
|---|---|---|
| committer | erictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-23 05:17:31 +0000 |
| commit | 6ac6017fe8cb4478aee135799c3b5f9862935250 (patch) | |
| tree | c762a82f4bc0a448d247c2faf3ca855aa90f73fc /MdeModulePkg/Bus/Usb/UsbKbDxe | |
| parent | 0641c5405cf66979307fb20d19f94bbd8424d341 (diff) | |
| download | edk2-platforms-6ac6017fe8cb4478aee135799c3b5f9862935250.tar.xz | |
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@12434 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Bus/Usb/UsbKbDxe')
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c | 7 |
1 files changed, 6 insertions, 1 deletions
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);
//
|