sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: BcfgDisplayDump(): address FilePathListLength by name

Browse Source 
The Buffer variable points at the beginning of an EFI_LOAD_OPTION
structure. We might as well address the "FilePathListLength" member by
name, rather than with *(UINT16*)(Buffer+4).

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@19711 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek
2016-01-21 18:40:13 +00:00
committed by lersek
parent e5945ef784
commit 3b6b1105cf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c
View File

@ -1108,11 +1108,12 @@ BcfgDisplayDump(
++Errors; ++Errors;
goto Cleanup; goto Cleanup;
} }
LoadOption = (EFI_LOAD_OPTION *)Buffer;
if ((*(UINT16*)(Buffer+4)) != 0) { if (LoadOption->FilePathListLength != 0) {
DevPath = AllocateZeroPool(*(UINT16*)(Buffer+4)); DevPath = AllocateZeroPool(LoadOption->FilePathListLength);
if (DevPath != NULL) { if (DevPath != NULL) {
CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), *(UINT16*)(Buffer+4)); CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), LoadOption->FilePathListLength);
DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE); DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
} }
} }
@ -1126,9 +1127,9 @@ BcfgDisplayDump(
VariableName, VariableName,
(CHAR16*)(Buffer+6), (CHAR16*)(Buffer+6),
DevPathString, DevPathString,
(StrSize((CHAR16*)(Buffer+6)) + *(UINT16*)(Buffer+4) + 6) <= BufferSize?L'N':L'Y'); (StrSize((CHAR16*)(Buffer+6)) + LoadOption->FilePathListLength + 6) <= BufferSize?L'N':L'Y');
if (VerboseOutput) { if (VerboseOutput) {
for (LoopVar2 = (StrSize((CHAR16*)(Buffer+6)) + *(UINT16*)(Buffer+4) + 6);LoopVar2<BufferSize;LoopVar2++){ for (LoopVar2 = (StrSize((CHAR16*)(Buffer+6)) + LoadOption->FilePathListLength + 6);LoopVar2<BufferSize;LoopVar2++){
ShellPrintEx( ShellPrintEx(
-1, -1,
-1, -1,