From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 10 Jun 2013 15:22:18 +0000 (+0000)
Subject: Fix an out of bounds array access.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b972457783f6f992d8ee2fe392609fd4b0c5cf00;p=oota-llvm.git

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@183666 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index 5b34c5eab68..b6eeb1484cf 100644
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -58,11 +58,12 @@ sys::identifyFileType(const char *Magic, unsigned Length) {
       break;
 
     case '\177':
-      if (Magic[1] == 'E' && Magic[2] == 'L' && Magic[3] == 'F') {
+      if (Length >= 18 && Magic[1] == 'E' && Magic[2] == 'L' &&
+          Magic[3] == 'F') {
         bool Data2MSB = Magic[5] == 2;
         unsigned high = Data2MSB ? 16 : 17;
         unsigned low  = Data2MSB ? 17 : 16;
-        if (Length >= 18 && Magic[high] == 0)
+        if (Magic[high] == 0)
           switch (Magic[low]) {
             default: break;
             case 1: return ELF_Relocatable_FileType;