OSDN Git Service

Make sure the directory contains info for all streams
authorDavid Majnemer <david.majnemer@gmail.com>
Sat, 28 May 2016 05:59:19 +0000 (05:59 +0000)
committerDavid Majnemer <david.majnemer@gmail.com>
Sat, 28 May 2016 05:59:19 +0000 (05:59 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271103 91177308-0d34-0410-b5e6-96231b3b80d8

lib/DebugInfo/PDB/Raw/PDBFile.cpp

index 68ed6c8..d0fbb14 100644 (file)
@@ -269,10 +269,15 @@ Error PDBFile::parseStreamData() {
     }
   }
 
-  for (uint32_t SI = 0; SI != NumStreams; ++SI) {
+  if (Context->StreamSizes.size() != NumStreams)
+    return make_error<RawError>(
+        raw_error_code::corrupt_file,
+        "The directory has fewer streams then expected");
+
+  for (uint32_t I = 0; I != NumStreams; ++I) {
     uint64_t NumExpectedStreamBlocks =
-        bytesToBlocks(getStreamByteSize(SI), getBlockSize());
-    size_t NumStreamBlocks = getStreamBlockList(SI).size();
+        bytesToBlocks(getStreamByteSize(I), getBlockSize());
+    size_t NumStreamBlocks = getStreamBlockList(I).size();
     if (NumExpectedStreamBlocks != NumStreamBlocks)
       return make_error<RawError>(raw_error_code::corrupt_file,
                                   "The number of stream blocks is not "