Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c

@@ -4126 +4126 @@
         }
 
-        Value = (EFI_HII_VALUE *)&Question->Value;
+        Status = HiiStatementValueToHiiValue (&Question->Value, Value);
+        if (EFI_ERROR (Status)) {
+          ReleaseHiiValue (Value);
+          Value->Type = EFI_IFR_TYPE_UNDEFINED;
+        }
+
         break;
 
@@ -4335 +4340 @@
           // push the questions' value on to the expression stack
           //
-          Value = (EFI_HII_VALUE *)&Question->Value;
+          Status = HiiStatementValueToHiiValue (&Question->Value, Value);
+          if (EFI_ERROR (Status)) {
+            ReleaseHiiValue (Value);
+            Value->Type = EFI_IFR_TYPE_UNDEFINED;
+          }
         }
 
@@ -4462 +4471 @@
         }
 
-        Value = (EFI_HII_VALUE *)&Question->Value;
+        Status = HiiStatementValueToHiiValue (&Question->Value, Value);
+        if (EFI_ERROR (Status)) {
+          ReleaseHiiValue (Value);
+          Value->Type = EFI_IFR_TYPE_UNDEFINED;
+        }
+
         break;