Refine code to make code more safely.

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

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
index e5b84d205a49ca333ad74644fe23ab745079f99c..8ab071fc458f5579d06a1fe27133ddae7d01a37d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
@@ -149,7 +149,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

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
index c41a85c38da223264d0ef7621fbdfe05b86c0f80..3f5243387d35b642aa6192c2312cdc1120a6bd44 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
@@ -700,7 +700,7 @@ Returns:
 \r
     Status = HiiDatabase->ExportPackageLists (HiiDatabase, Handle, &BufferSize, HiiPackageList);\r
   }\r
-  if (EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status) || (HiiPackageList == NULL)) {\r
     return Status;\r
   }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index 355935322c5c0cc87d7d657e3024f27448c2ae43..43d7fc6364d4ffe2efe4bbc0900703f9c6ddcaf9 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -958,7 +958,7 @@ ConstructConfigAltResp (
                );\r
   }\r
 \r
-  if (EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status) || (ConfigHdr == NULL)) {\r
     return Status;\r
   }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
index 29cdeb967a2173a172f11f754322f1f7ea8bd0fc..83820a3bbabc66b36a85c51221a17b7be5e318a0 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ia32/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