MdeModulePkg/HiiDatabaseDxe: Remove buffer error for string default.edk2-stable202502

Remove efivarstore IFR buffer error when string load default.
In the case of varstore type IFR, it will be NULL,
just break into next opcode process.

Resolve issue from commit cbe8a09dbac5c39d24ce5c4b9e7d44607f6c23da
varstore type IFR string might return status error
while execute ExtractConfig function.

Signed-off-by: Longhao Lee <longhaox.lee@intel.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index b71b447f5f..c9aabaa3da 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -3016,6 +3016,10 @@ ParseIfrData (
           goto Done;

         }

 

+        if (IfrEfiVarStoreTmp == NULL) {

+          break;

+        }

+

         //

         // Set default value base on the DefaultId list get from IFR data.

         //

@@ -3030,11 +3034,6 @@ ParseIfrData (
               goto Done;

             }

 

-            if (IfrEfiVarStoreTmp == NULL) {

-              Status = EFI_OUT_OF_RESOURCES;

-              goto Done;

-            }

-

             FindQuestionDefaultSetting (DefaultData.DefaultId, IfrEfiVarStoreTmp, &(IfrString->Question), (VOID *)StringData, VarWidth, QuestionReferBitField);

             if ((DefaultData.Value.string != 0) && (StringData != NULL)) {

               DefaultData.Value.string = InternalHiiSetString (HiiHandle, 0, StringData, NULL);