From 498a6136a271bfb95bcd9488d1036e57a5e0fae0 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Sat, 15 Feb 2020 08:58:40 +0100 Subject: Prevent gcc from issuing a warning upon coffnamecpy This is a follow up to d1262a6e9, more explicit to cope with GCC smartness. Differential Revision: https://reviews.llvm.org/D74666 --- llvm/lib/Object/WindowsResource.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Object/WindowsResource.cpp') diff --git a/llvm/lib/Object/WindowsResource.cpp b/llvm/lib/Object/WindowsResource.cpp index 0cf9da4..2a69c6c 100644 --- a/llvm/lib/Object/WindowsResource.cpp +++ b/llvm/lib/Object/WindowsResource.cpp @@ -721,8 +721,10 @@ WindowsResourceCOFFWriter::write(uint32_t TimeDateStamp) { // it's okay to *not* copy the trailing zero. static void coffnamecpy(char (&Dest)[COFF::NameSize], StringRef Src) { assert(Src.size() <= COFF::NameSize && - "Src is not larger than COFF::NameSize"); - strncpy(Dest, Src.data(), (size_t)COFF::NameSize); + "Src is larger than COFF::NameSize"); + assert((Src.size() == COFF::NameSize || Dest[Src.size()] == '\0') && + "Dest not zeroed upon initialization"); + memcpy(Dest, Src.data(), Src.size()); } void WindowsResourceCOFFWriter::writeCOFFHeader(uint32_t TimeDateStamp) { -- cgit v1.1