From: Justin Bogner <mail@justinbogner.com>
Date: Sat, 19 Apr 2014 00:33:12 +0000 (+0000)
Subject: ProfileData: Avoid UB when reading
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e382065b82e0a4858019c7ca4ce1c11227c7bd67;p=oota-llvm.git

ProfileData: Avoid UB when reading

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206674 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ProfileData/InstrProfReader.h b/include/llvm/ProfileData/InstrProfReader.h
index 5b0c6257a63..18a7e43437a 100644
--- a/include/llvm/ProfileData/InstrProfReader.h
+++ b/include/llvm/ProfileData/InstrProfReader.h
@@ -222,8 +222,9 @@ public:
   static std::pair<offset_type, offset_type>
   ReadKeyDataLength(const unsigned char *&D) {
     using namespace support;
-    return std::make_pair(endian::readNext<offset_type, little, unaligned>(D),
-                          endian::readNext<offset_type, little, unaligned>(D));
+    offset_type KeyLen = endian::readNext<offset_type, little, unaligned>(D);
+    offset_type DataLen = endian::readNext<offset_type, little, unaligned>(D);
+    return std::make_pair(KeyLen, DataLen);
   }
 
   StringRef ReadKey(const unsigned char *D, unsigned N) {