diff options
| author | serge-sans-paille <sguelton@redhat.com> | 2020-02-15 08:58:40 +0100 |
|---|---|---|
| committer | serge-sans-paille <sguelton@redhat.com> | 2020-02-18 16:13:59 +0100 |
| commit | 498a6136a271bfb95bcd9488d1036e57a5e0fae0 (patch) | |
| tree | ee4f5b173ae2380b5304fcbb21e8580b028a830e /llvm/lib/Object | |
| parent | 5526786a56bd5fb187a8c6f601268e58e351b3c8 (diff) | |
| download | llvm-498a6136a271bfb95bcd9488d1036e57a5e0fae0.zip llvm-498a6136a271bfb95bcd9488d1036e57a5e0fae0.tar.gz llvm-498a6136a271bfb95bcd9488d1036e57a5e0fae0.tar.bz2 | |
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
Diffstat (limited to 'llvm/lib/Object')
| -rw-r--r-- | llvm/lib/Object/WindowsResource.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |