Fixed two K8 report issue

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

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index 9bc82f16b7b47038a0280c90de0289fda176eb97..a13a3525f1e63fd3d59d753d28e623b4aedb1223 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -443,6 +443,10 @@ ExtractDataFromHiiHandle (
   SizeOfNvStore = 0;\r
   CachedStart   = 0;\r
 \r
+  if (DefaultImage == NULL || Guid == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+  \r
   Status        = GetHiiInterface (&Hii);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
index dbb648da5058c36410bc5d9a1c86f78c99026cf4..20ad068962c57f02acb660ff3cab2ed3e0ea79f4 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
@@ -393,7 +393,7 @@ InternalPrintGraphic (
   if (GraphicsOutput != NULL) {\r
     HorizontalResolution = GraphicsOutput->Mode->Info->HorizontalResolution;\r
     VerticalResolution = GraphicsOutput->Mode->Info->VerticalResolution;\r
-  } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
+  } else if (UgaDraw != NULL) {\r
     UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution, &ColorDepth, &RefreshRate);\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
@@ -466,8 +466,7 @@ InternalPrintGraphic (
                          NULL\r
                          );\r
 \r
-  } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
-    ASSERT (UgaDraw!= NULL);\r
+  } else if (UgaDraw != NULL) {\r
 \r
     Blt->Image.Bitmap = AllocateZeroPool (Blt->Width * Blt->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
     ASSERT (Blt->Image.Bitmap != NULL);\r