Fix detection of COFF executable files.

One overload of this function would try to identify a file
by opening it and using the first 32 bytes to identify the magic
of the file.  This didn't work properly when more than 32 bytes
is actually needed for magic detection to succeed.  So now we
have this overload read in the entire file.

Differential Revision: https://reviews.llvm.org/D44225

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327050 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner
2018-03-08 19:45:20 +00:00
parent 8951246e13
commit 4b32c56fb3
+6 -8
View File
@@ -14,6 +14,7 @@
#include "llvm/BinaryFormat/MachO.h"
#include "llvm/Support/Endian.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
#if !defined(_MSC_VER) && !defined(__MINGW32__)
#include <unistd.h>
@@ -205,15 +206,12 @@ file_magic llvm::identify_magic(StringRef Magic) {
}
std::error_code llvm::identify_magic(const Twine &Path, file_magic &Result) {
int FD;
if (std::error_code EC = openFileForRead(Path, FD))
return EC;
auto FileOrError = MemoryBuffer::getFile(Path);
if (!FileOrError)
return FileOrError.getError();
char Buffer[32];
int Length = read(FD, Buffer, sizeof(Buffer));
if (close(FD) != 0 || Length < 0)
return std::error_code(errno, std::generic_category());
std::unique_ptr<MemoryBuffer> FileBuffer = std::move(*FileOrError);
Result = identify_magic(FileBuffer->getBuffer());
Result = identify_magic(StringRef(Buffer, Length));
return std::error_code();
}