summaryrefslogtreecommitdiff
path: root/IntelFrameworkModulePkg/Universal
diff options
context:
space:
mode:
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2009-08-14 02:21:55 +0000
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2009-08-14 02:21:55 +0000
commitb55f8b0146ab1a0b26909a63bb04ba850b9ba198 (patch)
tree1efc6ee5916a71551a62edbf12820dcf47f99d5c /IntelFrameworkModulePkg/Universal
parentaeddd42532529a3701dc9f9a4f78005c075bc0d6 (diff)
downloadedk2-platforms-b55f8b0146ab1a0b26909a63bb04ba850b9ba198.tar.xz
1. Correct Col * Row string
2. Add error handle for no data hub system. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9065 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c8
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c3
2 files changed, 6 insertions, 5 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 790fe51d44..5146399dd4 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -754,7 +754,6 @@ UpdateConModePage (
UINTN Index;
UINTN Col;
UINTN Row;
- CHAR16 RowString[50];
CHAR16 ModeString[50];
CHAR16 *PStr;
UINTN MaxMode;
@@ -813,10 +812,9 @@ UpdateConModePage (
//
UnicodeValueToString (ModeString, 0, Col, 0);
PStr = &ModeString[0];
- StrnCat (PStr, L" x ", StrLen(L" x "));
- UnicodeValueToString (RowString, 0, Row, 0);
- PStr = &ModeString[0];
- StrnCat (PStr, RowString, StrLen(RowString));
+ StrnCat (PStr, L" x ", StrLen(L" x ") + 1);
+ PStr = PStr + StrLen (PStr);
+ UnicodeValueToString (PStr , 0, Row, 0);
ModeToken[Index] = HiiSetString (CallbackData->BmmHiiHandle, 0, ModeString, NULL);
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 9f25ebca6b..55fce979f7 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -721,6 +721,9 @@ UpdateFrontPageStrings (
Record = NULL;
do {
Status = DataHub->GetNextRecord (DataHub, &MonotonicCount, NULL, &Record);
+ if (EFI_ERROR (Status) || Record == NULL) {
+ break;
+ }
if (Record->DataRecordClass == EFI_DATA_RECORD_CLASS_DATA) {
DataHeader = (EFI_SUBCLASS_TYPE1_HEADER *) (Record + 1);
if (CompareGuid (&Record->DataRecordGuid, &gEfiMiscSubClassGuid) &&