From a7a5816b965d31cf3b1fb08e61a144b6a27bb5f7 Mon Sep 17 00:00:00 2001 From: Puyan Lotfi Date: Tue, 4 Sep 2018 01:57:30 +0000 Subject: [PATCH] [NFC][llvm-objcopy] Fixing a ubi-san problem with unaligned memory writes. llvm-svn: 341343 --- llvm/tools/llvm-objcopy/Object.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/tools/llvm-objcopy/Object.cpp b/llvm/tools/llvm-objcopy/Object.cpp index d8e90fd..e7ffb1e 100644 --- a/llvm/tools/llvm-objcopy/Object.cpp +++ b/llvm/tools/llvm-objcopy/Object.cpp @@ -153,9 +153,10 @@ void ELFSectionWriter::visit(const CompressedSection &Sec) { ArrayRef Magic = {'Z', 'L', 'I', 'B'}; std::copy(Magic.begin(), Magic.end(), Buf); Buf += Magic.size(); - uint64_t *DecompressedSizePtr = reinterpret_cast(Buf); - *DecompressedSizePtr = support::endian::read64be(&Sec.DecompressedSize); - Buf += sizeof(Sec.DecompressedSize); + const uint64_t DecompressedSize = + support::endian::read64be(&Sec.DecompressedSize); + memcpy(Buf, &DecompressedSize, sizeof(DecompressedSize)); + Buf += sizeof(DecompressedSize); } else { auto Chdr = reinterpret_cast *>(Buf); Chdr->ch_type = ELF::ELFCOMPRESS_ZLIB; -- 2.7.4