Refine code to make code run more safely.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11143 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index 43d7fc6364d4ffe2efe4bbc0900703f9c6ddcaf9..b0c9a7f1f23b4d1eea67172bc4708e62d0855abf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -1395,6 +1395,10 @@ Returns:
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
+  if (ConfigHdr == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   *StrBufferLen = BufferSize;\r
 \r
   StrPtr = ConfigHdr;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
index 11b36e056dda8434d98a2db3f991b28d9dce7a3b..a81bd0fb0f7ff781889f96112e7087f7e240c220 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/X64/RuntimeLib.c
@@ -930,7 +930,7 @@ Returns:
     // Try to get the PEI version of ReportStatusCode.\r
     //\r
     Status = GetPeiProtocol (&gEfiStatusCodeRuntimeProtocolGuid, (VOID **) &gReportStatusCode);\r
-    if (EFI_ERROR (Status)) {\r
+    if (EFI_ERROR (Status) || (gReportStatusCode == NULL)) {\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r