From d69bf66dc1ad8143260dcb8e095d7ed91b211dd7 Mon Sep 17 00:00:00 2001
From: niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 11 Oct 2010 04:37:28 +0000
Subject: Fix the corner case when there is only "\0\0" appended and the Index
 is 1. Return missing string instead of empty string.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10914 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'IntelFrameworkModulePkg/Universal/BdsDxe')

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 62ba394843..be3409457a 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -677,7 +677,11 @@ GetOptionalStringByIndex (
     StrSize           = AsciiStrSize (OptionalStrStart);
   } while (OptionalStrStart[StrSize] != 0 && Index != 0);
 
-  if (Index != 0) {
+  if ((Index != 0) || (StrSize == 1)) {
+    //
+    // Meet the end of strings set but Index is non-zero, or
+    // Find an empty string
+    //
     *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));
   } else {
     *String = AllocatePool (StrSize * sizeof (CHAR16));
-- 
cgit v1.2.3