Add version number checking to PTH files.

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

diff --git a/Driver/CacheTokens.cpp b/Driver/CacheTokens.cpp
index 975d3648ee29c95703aa436e311650d29960918f..aef59cbe352be1252665b29a2dcd3548816b4445 100644 (file)
--- a/Driver/CacheTokens.cpp
+++ b/Driver/CacheTokens.cpp
@@ -456,6 +456,7 @@ void PTHWriter::EmitCachedSpellings() {
 void PTHWriter::GeneratePTH() {
   // Generate the prologue.
   Out << "cfe-pth";
+  Emit32(PTHManager::Version);
   Offset JumpOffset = Out.tell();
   Emit32(0);
   

diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index 747ec101566ba7c52667e10aeb01b541a8db5cf6..54269c9ee15b3587d3e8a181da363c35c326e891 100644 (file)
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -522,12 +522,18 @@ PTHManager* PTHManager::Create(const std::string& file) {
   const unsigned char* BufEnd = (unsigned char*)File->getBufferEnd();
 
   // Check the prologue of the file.
-  if ((BufEnd - BufBeg) < (unsigned) (sizeof("cfe-pth") + 3) ||
+  if ((BufEnd - BufBeg) < (unsigned) (sizeof("cfe-pth") + 3 + 4) ||
       memcmp(BufBeg, "cfe-pth", sizeof("cfe-pth") - 1) != 0)
     return 0;
   
-  // Compute the address of the index table at the end of the PTH file.
+  // Read the PTH version.
   const unsigned char *p = BufBeg + (sizeof("cfe-pth") - 1);
+  unsigned Version = ReadLE32(p);
+  
+  if (Version != PTHManager::Version)
+    return 0;
+
+  // Compute the address of the index table at the end of the PTH file.  
   const unsigned char *EndTable = BufBeg + ReadLE32(p);
   
   if (EndTable >= BufEnd)