From be6ff0f289f40e42a75d3c53af7f43a667f509d5 Mon Sep 17 00:00:00 2001
From: Yang Gang <yanggang@byosoft.com.cn>
Date: Tue, 27 Jan 2026 17:42:36 +0800
Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Fix parser issue in
 GetNameElement()

This commit removes an wrong goto statement which may cause DXE_ASSERT!

`ConfigRequest` example: `&NameValueVar0&NameValueVar1&NameValueVar2`.

When `*Progress` is `&NameValueVar2`, code will run to `goto Done;`,
then return NULL.

Signed-off-by: Yang Gang <yanggang@byosoft.com.cn>
---
 MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 809a3f9707..246b4f47b1 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -3670,8 +3670,6 @@ GetNameElement (
       HasValue = TRUE;
     } else if ((NextTag = StrStr (StringPtr, L"&")) != NULL) {
       *NextTag = L'\0';
-    } else {
-      goto Done;
     }
 
     //