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.car...@intel.com>
Cc: Ryan Harkin <ryan.har...@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
---
ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | 10
++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
index f6f4ab3..f5ae7bc 100644
--- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
+++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
@@ -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,
--
1.8.3.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
