replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Support][FileSystem] Fix identify_magic for big endian ELF. 

llvm-svn: 178905
This commit is contained in:
Michael J. Spencer 2013-04-05 20:10:04 +00:00
parent 3add3e9c4a
commit b8055cbc9d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Support/PathV2.cpp
View File

@ -789,8 +789,11 @@ file_magic identify_magic(StringRef magic) {
case '\177':
if (magic[1] == 'E' && magic[2] == 'L' && magic[3] == 'F') {
if (magic.size() >= 18 && magic[17] == 0)
switch (magic[16]) {
bool Data2MSB = magic[5] == 2;
unsigned high = Data2MSB ? 16 : 17;
unsigned low = Data2MSB ? 17 : 16;
if (magic.size() >= 18 && magic[high] == 0)
switch (magic[low]) {
default: break;
case 1: return file_magic::elf_relocatable;
case 2: return file_magic::elf_executable;

12
llvm/unittests/Support/Path.cpp
View File

@ -298,12 +298,19 @@ TEST_F(FileSystemTest, DirectoryIteration) {
ASSERT_LT(z0, za1);
}
const char elf[] = {0x7f, 'E', 'L', 'F', 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
TEST_F(FileSystemTest, Magic) {
struct type {
const char *filename;
const char *magic_str;
size_t magic_str_len;
} types [] = {{"magic.archive", "!<arch>\x0A", 8}};
size_t magic_str_len;
fs::file_magic magic;
} types [] = {
{"magic.archive", "!<arch>\x0A", 8, fs::file_magic::archive},
{"magic.elf", elf, sizeof(elf),
fs::file_magic::elf_relocatable}
};
// Create some files filled with magic.
for (type *i = types, *e = types + (sizeof(types) / sizeof(type)); i != e;
@ -320,6 +327,7 @@ TEST_F(FileSystemTest, Magic) {
bool res = false;
ASSERT_NO_ERROR(fs::has_magic(file_pathname.c_str(), magic, res));
EXPECT_TRUE(res);
EXPECT_EQ(i->magic, fs::identify_magic(magic));
}
}