Redfish/HiiUtilityLib Fix incorrect type assignment

Replaced direct assignment of 'Value = (EFI_HII_VALUE *)&Question->Value' with the correct usage of HiiStatementValueToHiiValue function. This resolves the issue where EFI_HII_VALUE and HII_STATEMENT_VALUE types are incompatible, ensuring proper handling of Question->Value. Signed-off-by: Igor Kulchytskyy <[email protected]>
tianocore · Dec 27, 2024 · 0986082 · 0986082
1 parent 9e65374
commit 0986082
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c b/RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c
@@ -4125,7 +4125,12 @@ EvaluateHiiExpression (
           goto Done;
         }
 
-        Value = (EFI_HII_VALUE *)&Question->Value;
+        Status = HiiStatementValueToHiiValue (&Question->Value, Value);
+        if (EFI_ERROR (Status)) {
+          ReleaseHiiValue (Value);
+          Value->Type = EFI_IFR_TYPE_UNDEFINED;
+        }
+
         break;
 
       case EFI_IFR_SECURITY_OP:
@@ -4334,7 +4339,11 @@ EvaluateHiiExpression (
           //
           // 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;
+          }
         }
 
         break;
@@ -4461,7 +4470,12 @@ EvaluateHiiExpression (
           break;
         }
 
-        Value = (EFI_HII_VALUE *)&Question->Value;
+        Status = HiiStatementValueToHiiValue (&Question->Value, Value);
+        if (EFI_ERROR (Status)) {
+          ReleaseHiiValue (Value);
+          Value->Type = EFI_IFR_TYPE_UNDEFINED;
+        }
+
         break;
 
       case EFI_IFR_STRING_REF2_OP: