#include <io.h>\r
#endif\r
#include <assert.h>\r
+#include <stdbool.h>\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <string.h>\r
\r
assert(Sym->st_name < StrtabShdr->sh_size);\r
\r
- return (UINT8*)mEhdr + StrtabShdr->sh_offset + Sym->st_name;\r
+ UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;\r
+\r
+ bool foundEnd = false;\r
+ for (UINT32 i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {\r
+ foundEnd = StrtabContents[i] == 0;\r
+ }\r
+ assert(foundEnd);\r
+\r
+ return StrtabContents + Sym->st_name;\r
}\r
\r
//\r
NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
break;\r
default:\r
- VerboseMsg ("%s unknown e_machine type. Assume IA-32", (UINTN)mEhdr->e_machine);\r
+ VerboseMsg ("%s unknown e_machine type %hu. Assume IA-32", mInImageName, mEhdr->e_machine);\r
NtHdr->Pe32.FileHeader.Machine = EFI_IMAGE_MACHINE_IA32;\r
NtHdr->Pe32.OptionalHeader.Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;\r
}\r
}\r
\r
Error (NULL, 0, 3000, "Invalid",\r
- "%s: Bad definition for symbol '%s'@%p or unsupported symbol type. "\r
+ "%s: Bad definition for symbol '%s'@%#x or unsupported symbol type. "\r
"For example, absolute and undefined symbols are not supported.",\r
mInImageName, SymName, Sym->st_value);\r
\r
#include <io.h>\r
#endif\r
#include <assert.h>\r
+#include <stdbool.h>\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <string.h>\r
\r
assert(Sym->st_name < StrtabShdr->sh_size);\r
\r
- return (UINT8*)mEhdr + StrtabShdr->sh_offset + Sym->st_name;\r
+ UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;\r
+\r
+ bool foundEnd = false;\r
+ for (UINT32 i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {\r
+ foundEnd = StrtabContents[i] == 0;\r
+ }\r
+ assert(foundEnd);\r
+\r
+ return StrtabContents + Sym->st_name;\r
}\r
\r
//\r
mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS64);\r
break;\r
default:\r
- VerboseMsg ("%s unknown e_machine type. Assume X64", (UINTN)mEhdr->e_machine);\r
+ VerboseMsg ("%s unknown e_machine type %hu. Assume X64", mInImageName, mEhdr->e_machine);\r
mCoffOffset += sizeof (EFI_IMAGE_NT_HEADERS64);\r
break;\r
}\r
}\r
\r
Error (NULL, 0, 3000, "Invalid",\r
- "%s: Bad definition for symbol '%s'@%p or unsupported symbol type. "\r
+ "%s: Bad definition for symbol '%s'@%#llx or unsupported symbol type. "\r
"For example, absolute and undefined symbols are not supported.",\r
mInImageName, SymName, Sym->st_value);\r
\r