1 files changed, 9 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index abafa222e7..e51a9fe174 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1,7 +1,7 @@
 /** @file
   Core image handling services to load and unload PeImage.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -232,6 +232,14 @@ CoreReadImageFile (
   UINTN               EndPosition;
   IMAGE_FILE_HANDLE  *FHand;
 
+  if (UserHandle == NULL || ReadSize == NULL || Buffer == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (MAX_ADDRESS - Offset < *ReadSize) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   FHand = (IMAGE_FILE_HANDLE  *)UserHandle;
   ASSERT (FHand->Signature == IMAGE_FILE_HANDLE_SIGNATURE);