BaseTools/GenFw: Correct datatypes in diagnostic messages and check for string termin...

[mirror_edk2.git] / BaseTools / Source / C / GenFw / Elf64Convert.c

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 5afd2ab7cab36bca7e2a95c853f7db3b0040e5f5..3b5f63010388ef692ef8b83528e868eab947833b 100644 (file)
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #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
@@ -302,7 +303,15 @@ GetSymName (
 \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
@@ -337,7 +346,7 @@ ScanSections64 (
     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
@@ -721,7 +730,7 @@ WriteSections64 (
           }\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