Refine code to make it more safely.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Feng Tian <feng.tian@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15598 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
Implementation for EFI_HII_FONT_PROTOCOL.
|
||||
|
||||
|
||||
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -1040,8 +1040,12 @@ IsSystemFontInfo (
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
SystemDefault = NULL;
|
||||
DefaultLen = 0;
|
||||
|
||||
Status = GetSystemFont (Private, &SystemDefault, &DefaultLen);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
ASSERT ((SystemDefault != NULL) && (DefaultLen != 0));
|
||||
|
||||
//
|
||||
// Record the system default info.
|
||||
@@ -1687,6 +1691,7 @@ HiiStringToImage (
|
||||
SysFontFlag = IsSystemFontInfo (Private, (EFI_FONT_DISPLAY_INFO *) StringInfo, &SystemDefault, NULL);
|
||||
|
||||
if (SysFontFlag) {
|
||||
ASSERT (SystemDefault != NULL);
|
||||
FontInfo = NULL;
|
||||
Height = SystemDefault->FontInfo.FontSize;
|
||||
BaseLine = SystemDefault->FontInfo.FontSize;
|
||||
@@ -2580,6 +2585,7 @@ HiiGetGlyph (
|
||||
Foreground = StringInfoOut->ForegroundColor;
|
||||
Background = StringInfoOut->BackgroundColor;
|
||||
} else {
|
||||
ASSERT (SystemDefault != NULL);
|
||||
Foreground = SystemDefault->ForegroundColor;
|
||||
Background = SystemDefault->BackgroundColor;
|
||||
}
|
||||
@@ -2723,6 +2729,7 @@ HiiGetFontInfo (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
StringInfoOutLen = 0;
|
||||
FontInfo = NULL;
|
||||
SystemDefault = NULL;
|
||||
LocalFontHandle = NULL;
|
||||
|
Reference in New Issue
Block a user