This reverts commit r312526.
Revert "Fix test/DebugInfo/dwarfdump-decompression-invalid-size.test"
This reverts commit r312527.
It causes an ASan failure:
http://lab.llvm.org:8080/green/job/clang-stage2-cmake-RgSan_check/4150
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312582
91177308-0d34-0410-b5e6-
96231b3b80d8
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/ErrorHandling.h"
namespace llvm {
namespace object {
/// @brief Resize the buffer and uncompress section data into it.
/// @param Out Destination buffer.
template <class T> Error resizeAndDecompress(T &Out) {
- install_bad_alloc_error_handler(outOfMemoryHandler, this);
Out.resize(DecompressedSize);
- remove_bad_alloc_error_handler();
return decompress({Out.data(), (size_t)DecompressedSize});
}
static bool isGnuStyle(StringRef Name);
private:
- static void outOfMemoryHandler(void *Data, const std::string &Message, bool);
-
- Decompressor(StringRef Name, StringRef Data);
+ Decompressor(StringRef Data);
Error consumeCompressedGnuHeader();
Error consumeCompressedZLibHeader(bool Is64Bit, bool IsLittleEndian);
- StringRef SectionName;
StringRef SectionData;
uint64_t DecompressedSize;
};
if (!zlib::isAvailable())
return createError("zlib is not available");
- Decompressor D(Name, Data);
+ Decompressor D(Data);
Error Err = isGnuStyle(Name) ? D.consumeCompressedGnuHeader()
: D.consumeCompressedZLibHeader(Is64Bit, IsLE);
if (Err)
return D;
}
-Decompressor::Decompressor(StringRef Name, StringRef Data)
- : SectionName(Name), SectionData(Data), DecompressedSize(0) {}
+Decompressor::Decompressor(StringRef Data)
+ : SectionData(Data), DecompressedSize(0) {}
Error Decompressor::consumeCompressedGnuHeader() {
if (!SectionData.startswith("ZLIB"))
size_t Size = Buffer.size();
return zlib::uncompress(SectionData, Buffer.data(), Size);
}
-
-void Decompressor::outOfMemoryHandler(void *Data, const std::string &Message,
- bool) {
- const auto *D = static_cast<const Decompressor *>(Data);
- report_fatal_error("decompression of '" + Twine(D->SectionName) +
- "' failed: unable to allocate " +
- Twine(D->DecompressedSize) + " bytes.");
-}
+++ /dev/null
-REQUIRES: zlib
-
-// dwarfdump-decompression-invalid-size.elf-x86-64 is prepared using following
-// source code and invocation:
-// test.cpp:
-// int main() { return 0; }
-//
-// gcc test.cpp -o out -g -Wl,--compress-debug-sections,zlib
-//
-// After that result object was modified manually. Decompressed size of
-// .debug_frame section was changed to 0xffffffffffffffff in compression
-// header.
-RUN: not llvm-dwarfdump %p/Inputs/dwarfdump-decompression-invalid-size.elf-x86-64 2>&1 | FileCheck %s
-
-CHECK: decompression of '.debug_frame' failed: unable to allocate 18446744073709551615 bytes.