mirror of https://github.com/acidanthera/audk.git
ShellPkg: BcfgDisplayDump(): hoist NULL-init of DevPath[String]
It will help with error handling if we move these initializations near the top of the loop body. This patch is not supposed to change behavior. Cc: Jaben Carsey <jaben.carsey@intel.com> Cc: Ryan Harkin <ryan.harkin@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19708 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
c7e97f6d44
commit
43da602cb4
|
@ -1060,6 +1060,9 @@ BcfgDisplayDump(
|
|||
for (LoopVar = 0 ; LoopVar < OrderCount ; LoopVar++) {
|
||||
Buffer = NULL;
|
||||
BufferSize = 0;
|
||||
DevPath = NULL;
|
||||
DevPathString = NULL;
|
||||
|
||||
UnicodeSPrint(VariableName, sizeof(VariableName), L"%s%04x", Op, CurrentOrder[LoopVar]);
|
||||
|
||||
Status = gRT->GetVariable(
|
||||
|
@ -1085,15 +1088,10 @@ BcfgDisplayDump(
|
|||
|
||||
if ((*(UINT16*)(Buffer+4)) != 0) {
|
||||
DevPath = AllocateZeroPool(*(UINT16*)(Buffer+4));
|
||||
if (DevPath == NULL) {
|
||||
DevPathString = NULL;
|
||||
} else {
|
||||
if (DevPath != NULL) {
|
||||
CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), *(UINT16*)(Buffer+4));
|
||||
DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
|
||||
}
|
||||
} else {
|
||||
DevPath = NULL;
|
||||
DevPathString = NULL;
|
||||
}
|
||||
ShellPrintHiiEx(
|
||||
-1,
|
||||
|
|
Loading…
Reference in New Issue