commit 7e950b261ab2da7b385f01dae7afd1f38b87659b
author David Majnemer <david.majnemer@gmail.com> Sat May 28 05:59:19 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Sat May 28 05:59:19 2016 +0000
tree b5cbd17d7972a0024dda98d98b21bbbe9de1e1a2
parent 67a94a795d760c963cb21ad851769c8fd7734883

Make sure the directory contains info for all streams

llvm-svn: 271103

llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp

diff --git a/llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp b/llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp
index 68ed6c8..d0fbb14 100644
--- a/llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp
+++ b/llvm/lib/DebugInfo/PDB/Raw/PDBFile.cpp
@@ -269,10 +269,15 @@
     }
   }
 
-  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 "