Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RedfishPkg/HiiUtilityLib: Fix incorrect type assignment #10562

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions OvmfPkg/RUNTIME_CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Some aspects of OVMF can be configured from the host, mostly by adding
firmware config files using the qemu command line option `-fw_cfg`.
The official namespace prefix for edk2 is `opt/org.tianocore/` which
The official namespace prefix for edk2 is `opt/org.tianocode/` which
is used by most options. Some options are elsewhere for historical
reasons.

Expand Down Expand Up @@ -116,16 +116,6 @@ qemu-system-x86_64 -fw_cfg name=opt/org.tianocore/UninstallMemAttrProtocol,strin
```


## Shell: opt/org.tianocore/EFIShellSupport

This enables/disables the EFI shell.
Default: enabled. Usage:

```
qemu-system-x86_64 -fw_cfg name=opt/org.tianocore/EFIShellSupport,string=no
```


## Platform: opt/org.tianocore/X-Cpuhp-Bugcheck-Override

On some older qemu versions CPU hotplug support was broken. OVMF
Expand Down
20 changes: 17 additions & 3 deletions RedfishPkg/Library/HiiUtilityLib/HiiUtilityInternal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down
Loading