summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdong1 <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>2009-03-24 06:53:26 +0000
committergdong1 <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>2009-03-24 06:53:26 +0000
commit5547062df502d26985e47b870107c7f9f6838afb (patch)
tree0021237f2384e8f8d421e2858ff6e7a93eeb12f4
parent33f201a09c272685491504b3604001c362ff06e3 (diff)
downloadedk2-5547062df502d26985e47b870107c7f9f6838afb.zip
edk2-5547062df502d26985e47b870107c7f9f6838afb.tar.gz
edk2-5547062df502d26985e47b870107c7f9f6838afb.tar.bz2
Fixed two K8 report issue
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7929 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c4
-rw-r--r--IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index 9bc82f1..a13a352 100644
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -443,6 +443,10 @@ ExtractDataFromHiiHandle (
SizeOfNvStore = 0;
CachedStart = 0;
+ if (DefaultImage == NULL || Guid == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
Status = GetHiiInterface (&Hii);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
index dbb648d..20ad068 100644
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibPrint.c
@@ -393,7 +393,7 @@ InternalPrintGraphic (
if (GraphicsOutput != NULL) {
HorizontalResolution = GraphicsOutput->Mode->Info->HorizontalResolution;
VerticalResolution = GraphicsOutput->Mode->Info->VerticalResolution;
- } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {
+ } else if (UgaDraw != NULL) {
UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution, &ColorDepth, &RefreshRate);
} else {
Status = EFI_UNSUPPORTED;
@@ -466,8 +466,7 @@ InternalPrintGraphic (
NULL
);
- } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {
- ASSERT (UgaDraw!= NULL);
+ } else if (UgaDraw != NULL) {
Blt->Image.Bitmap = AllocateZeroPool (Blt->Width * Blt->Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
ASSERT (Blt->Image.Bitmap != NULL);