Add more check to avoid access violation.

Signed-off-by: ydong10
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12470 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
index 2f8b384f6f512b160f8b8f1e2b5fd4bf204b6560..482d6ad40403426124cea89bba47dc0683e6bfc9 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
@@ -358,7 +358,7 @@ UefiIfrGetBufferTypeDefaults (
   ASSERT (UefiDefaults != NULL);\r
 \r
   *UefiDefaults = AllocateZeroPool (sizeof (LIST_ENTRY));\r
-  ASSERT (UefiDefaults != NULL);\r
+  ASSERT (*UefiDefaults != NULL);\r
   InitializeListHead (*UefiDefaults);\r
 \r
   DefaultLink = GetFirstNode (&ThunkContext->FormSet->DefaultStoreListHead);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
index 400b367136355f287821da738a93bff3d982e458..c0ce1b23f8c725f0910693009d6e1528a3edde5b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
@@ -582,7 +582,7 @@ Returns:
   //\r
   // Return an error if buffer is too small\r
   //\r
-  if (SizeOfNvStore > *ImageLength) {\r
+  if (SizeOfNvStore > *ImageLength || DefaultImage == NULL) {\r
     gBS->FreePool (OldData);\r
     *ImageLength = (UINT16) SizeOfNvStore;\r
     return EFI_BUFFER_TOO_SMALL;\r