diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 19:04:48 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 19:04:48 +0000 |
| commit | 1d50926e71170ac6ef1ea38b97ac2329109afa4a (patch) | |
| tree | ffd77c284bc1bb8fd5d51c7d302e2d7a2924514d /llvm/lib/BinaryFormat/Magic.cpp | |
| parent | 0eafa581a3878c5fb52a513bb329fa82002e72da (diff) | |
| download | llvm-1d50926e71170ac6ef1ea38b97ac2329109afa4a.zip llvm-1d50926e71170ac6ef1ea38b97ac2329109afa4a.tar.gz llvm-1d50926e71170ac6ef1ea38b97ac2329109afa4a.tar.bz2 | |
Revert "Revert "Replace trivial use of external rc.exe by writing our own .res file.""
This reverts commit 8c8dce3b8f15d6ebaefc35ce88f15a85c8cdbd6e.
llvm-svn: 307191
Diffstat (limited to 'llvm/lib/BinaryFormat/Magic.cpp')
| -rw-r--r-- | llvm/lib/BinaryFormat/Magic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/BinaryFormat/Magic.cpp b/llvm/lib/BinaryFormat/Magic.cpp index 5d0a71f..b19a07a 100644 --- a/llvm/lib/BinaryFormat/Magic.cpp +++ b/llvm/lib/BinaryFormat/Magic.cpp @@ -51,7 +51,8 @@ file_magic llvm::identify_magic(StringRef Magic) { return file_magic::coff_import_library; } // Windows resource file - if (startswith(Magic, "\0\0\0\0\x20\0\0\0\xFF")) + if (Magic.size() >= sizeof(COFF::WinResMagic) && + memcmp(Magic.data(), COFF::WinResMagic, sizeof(COFF::WinResMagic)) == 0) return file_magic::windows_resource; // 0x0000 = COFF unknown machine type if (Magic[1] == 0) |