Fix an issue that an assert occurrs if user inputs a password whose length is less...

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index ac6f2ac24419fc7a70e001d570f387f9f6295e92..b8d0021303658506df21de91c307a69f4d3f7b9e 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -690,10 +690,14 @@ CreateIfrDataArray (
       break;\r
 \r
     case EFI_IFR_TYPE_STRING:\r
       break;\r
 \r
     case EFI_IFR_TYPE_STRING:\r

-      String = HiiGetString (ConfigAccess->ThunkContext->UefiHiiHandle, Value->string, NULL);\r
-      ASSERT (String != NULL);\r
+      if (Value->string == 0) {\r
+        Size = 0;\r
+      } else {\r
+        String = HiiGetString (ConfigAccess->ThunkContext->UefiHiiHandle, Value->string, NULL);\r
+        ASSERT (String != NULL);\r

 \r
 \r

-      Size = StrSize (String);\r
+        Size = StrSize (String);\r
+      }\r

       break;\r
       \r
     default:\r
       break;\r
       \r
     default:\r


@@ -741,9 +745,11 @@ CreateIfrDataArray (
         break;\r
 \r
       case EFI_IFR_TYPE_STRING:\r
         break;\r
 \r
       case EFI_IFR_TYPE_STRING:\r

-        ASSERT (String != NULL);\r
-        StrCpy ((CHAR16 *) &IfrDataEntry->Data, String);\r
-        FreePool (String);\r
+        if (Size != 0) {\r
+          ASSERT (String != NULL);\r
+          StrCpy ((CHAR16 *) &IfrDataEntry->Data, String);\r
+          FreePool (String);\r
+        }\r

         break;\r
       default:\r
         ASSERT (FALSE);\r
         break;\r
       default:\r
         ASSERT (FALSE);\r