diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2023-03-11 11:31:51 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-03-13 22:11:55 +0000 |
| commit | e4c1d8d2317984bd9cb447eba916956841063ec4 (patch) | |
| tree | f62faf000feeda5676f6a8b1de08fb40b28ccd14 /ShellPkg/Library/UefiHandleParsingLib | |
| parent | d2bfe289668e32940cca5da12bc201bf9b6c84d8 (diff) | |
| download | edk2-e4c1d8d2317984bd9cb447eba916956841063ec4.tar.gz edk2-e4c1d8d2317984bd9cb447eba916956841063ec4.tar.bz2 edk2-e4c1d8d2317984bd9cb447eba916956841063ec4.zip | |
ShellPkg/Library: Fix 32-bit truncation of pointer values
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4366
Update C and UNI files that are incorrectly using %x or %08x
instead of %p for pointer values. On 64-bit systems, this is
truncating pointer values above 4GB.
In reviewing ShellPkg for this issue some unused UNI strings
with incorrect format specifiers were removed instead of being
fixed.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'ShellPkg/Library/UefiHandleParsingLib')
| -rw-r--r-- | ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni index aa3396cea9..6bcb3cd9e4 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni @@ -173,7 +173,7 @@ #string STR_HII #language en-US "HII"
#string STR_HII_FORM_CALLBACK #language en-US "HIICallback"
-#string STR_TXT_OUT_DUMP_HEADER #language en-US " Address: %%H%X%%N Attrib %02x"
+#string STR_TXT_OUT_DUMP_HEADER #language en-US " Address: %%H%p%%N Attrib %02x"
#string STR_TXT_OUT_DUMP_LINE #language en-US "\r\n %c mode %d: Col %d Row %d"
#string STR_DRIVER_FAM_OVERRIDE #language en-US "DriverFamilyOverride"
@@ -361,7 +361,7 @@ #string STR_DEBUGSUPPORT_INFO #language en-US " Isa = %s"
#string STR_DEBUGSUPPORT_UNKNOWN #language en-US " Unknown (%%H%s%%N)"
-#string STR_PCIRB_DUMP_PH #language en-US " ParentHandle..: %%H%x%%N\r\n"
+#string STR_PCIRB_DUMP_PH #language en-US " ParentHandle..: %%H%p%%N\r\n"
#string STR_PCIRB_DUMP_SEG #language en-US " Segment #.....: %%H%x%%N\r\n"
#string STR_PCIRB_DUMP_ATT #language en-US " Attributes....: %%H%x%%N\r\n"
#string STR_PCIRB_DUMP_SUPPORTS #language en-US " Supports......: %%H%x%%N\r\n"
@@ -375,7 +375,7 @@ " Device #......: %02x\r\n"
" Function #....: %02x\r\n"
" ROM Size......: %lx\r\n"
- " ROM Location..: %08x\r\n"
+ " ROM Location..: %p\r\n"
" Vendor ID.....: %04x\r\n"
" Device ID.....: %04x\r\n"
" Class Code....: %02x %02x %02x\r\n"
@@ -388,18 +388,18 @@ #string STR_LI_DUMP_NAME #language en-US " Name..........: %%H%s%%N\r\n"
#string STR_LI_DUMP_MAIN #language en-US " Revision......: %%H0x%08x%%N\r\n"
- " ParentHandle..: %%H%x%%N\r\n"
- " SystemTable...: %%H%x%%N\r\n"
- " DeviceHandle..: %%H%x%%N\r\n"
+ " ParentHandle..: %%H%p%%N\r\n"
+ " SystemTable...: %%H%p%%N\r\n"
+ " DeviceHandle..: %%H%p%%N\r\n"
" FilePath......: %%H%s%%N\r\n"
" PdbFileName...: %%H%a%%N\r\n"
" OptionsSize...: %%H%x%%N\r\n"
- " LoadOptions...: %%H%x%%N\r\n"
- " ImageBase.....: %%H%x%%N\r\n"
+ " LoadOptions...: %%H%p%%N\r\n"
+ " ImageBase.....: %%H%p%%N\r\n"
" ImageSize.....: %%H%Lx%%N\r\n"
" CodeType......: %%H%s%%N\r\n"
" DataType......: %%H%s%%N\r\n"
- " Unload........: %%H%x%%N"
+ " Unload........: %%H%p%%N"
#string STR_GOP_DUMP_MAIN #language en-US " Max Mode..............: %%H0x%08x%%N\r\n"
" Current Mode..........: %%H0x%08x%%N\r\n"
|