diff --git a/BaseTools/ImageTool/PeEmit.c b/BaseTools/ImageTool/PeEmit.c
index 4375a9c425..910d5125a7 100644
--- a/BaseTools/ImageTool/PeEmit.c
+++ b/BaseTools/ImageTool/PeEmit.c
@@ -400,6 +400,7 @@ ToolImageEmitPeSection (
     Segment->Name,
     sizeof (SectionHeader->Name)
     );
+  SectionHeader->Name[ARRAY_SIZE (SectionHeader->Name) - 1] = 0;
 
   SectionHeader->VirtualSize      = Segment->ImageSize;
   SectionHeader->VirtualAddress   = Segment->ImageAddress;