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 | 045760e4345ba2ded610b4a4b583f57112cebfc8 (patch) | |
| tree | 927743fd8e3e1d4aa1b6ac3e86f75cb5770d6a60 /lib/BinaryFormat | |
| parent | 1efceea97ed019d8ccbc30ce078928d730a08467 (diff) | |
Revert "Revert "Replace trivial use of external rc.exe by writing our own .res file.""
This reverts commit 8c8dce3b8f15d6ebaefc35ce88f15a85c8cdbd6e.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307191 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/BinaryFormat')
| -rw-r--r-- | lib/BinaryFormat/Magic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/BinaryFormat/Magic.cpp b/lib/BinaryFormat/Magic.cpp index 5d0a71fc7802..b19a07a9066b 100644 --- a/lib/BinaryFormat/Magic.cpp +++ b/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) |