6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Port r183666 to identify_magic.

Browse Source 
It will be tested in the next commit which moves another user to identify_magic.

Original message:

Fix an out of bounds array access.

We were looking at Magic[5] without checking Length. Since this path would not
return unless Length >= 18 anyway, just move the >= 18 check up.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183753 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-06-11 17:25:45 +00:00
parent 9bd9f8e839
commit 0179706213
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Support/PathV2.cpp
View File

@ -788,11 +788,12 @@ error_code has_magic(const Twine &path, const Twine &magic, bool &result) {
break; break;
case '\177': case '\177':
if (Magic[1] == 'E' && Magic[2] == 'L' && Magic[3] == 'F') { if (Magic.size() >= 18 && Magic[1] == 'E' && Magic[2] == 'L' &&
Magic[3] == 'F') {
bool Data2MSB = Magic[5] == 2; bool Data2MSB = Magic[5] == 2;
unsigned high = Data2MSB ? 16 : 17; unsigned high = Data2MSB ? 16 : 17;
unsigned low = Data2MSB ? 17 : 16; unsigned low = Data2MSB ? 17 : 16;
if (Magic.size() >= 18 && Magic[high] == 0) if (Magic[high] == 0)
switch (Magic[low]) { switch (Magic[low]) {
default: break; default: break;
case 1: return file_magic::elf_relocatable; case 1: return file_magic::elf_relocatable;