1 files changed, 2 insertions, 10 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 117d6ea636..ac6f2ac244 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -674,7 +674,6 @@ CreateIfrDataArray (
   FORMSET_STORAGE                  *BufferStorage;
   EFI_STATUS                        Status;
   UINTN                             Size;
-  UINTN                             StringSize;
   EFI_STRING                        String;
 
   *NvMapAllocated = FALSE;
@@ -691,17 +690,10 @@ CreateIfrDataArray (
       break;
 
     case EFI_IFR_TYPE_STRING:
-      StringSize = 0;
-      Status = HiiLibGetString (ConfigAccess->ThunkContext->UefiHiiHandle, Value->string, String, &StringSize);
-      ASSERT (Status == EFI_BUFFER_TOO_SMALL);
-
-      String = AllocateZeroPool (StringSize);
+      String = HiiGetString (ConfigAccess->ThunkContext->UefiHiiHandle, Value->string, NULL);
       ASSERT (String != NULL);
 
-      Status = HiiLibGetString (ConfigAccess->ThunkContext->UefiHiiHandle, Value->string, String, &StringSize);
-      ASSERT_EFI_ERROR (Status);
-
-      Size = StringSize;
+      Size = StrSize (String);
       break;
       
     default: