浏览代码

[Frontend] Verify that the bitstream is not empty before reading
the serialised diagnostics

Clang should avoid calling report_fatal_error when the file with the serialised
diagnostics is empty. This commit changes Clang's serialised diagnostic reader,
now it reports an appropriate error instead of crashing.

rdar://31939877

Differential Revision: https://reviews.llvm.org/D35069


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

Alex Lorenz 8 年之前
父节点
当前提交
a43da8254f
共有 3 个文件被更改,包括 5 次插入0 次删除
  1. 3 0
      lib/Frontend/SerializedDiagnosticReader.cpp
  2. 0 0
      test/Index/Inputs/empty.dia
  3. 2 0
      test/Index/read-empty-diags.test

+ 3 - 0
lib/Frontend/SerializedDiagnosticReader.cpp

@@ -27,6 +27,9 @@ std::error_code SerializedDiagnosticReader::readDiagnostics(StringRef File) {
   llvm::BitstreamCursor Stream(**Buffer);
   Optional<llvm::BitstreamBlockInfo> BlockInfo;
 
+  if (Stream.AtEndOfStream())
+    return SDError::InvalidSignature;
+
   // Sniff for the signature.
   if (Stream.Read(8) != 'D' ||
       Stream.Read(8) != 'I' ||

+ 0 - 0
test/Index/Inputs/empty.dia


+ 2 - 0
test/Index/read-empty-diags.test

@@ -0,0 +1,2 @@
+// RUN: not c-index-test -read-diagnostics %S/Inputs/empty.dia 2>&1 | FileCheck %s
+// CHECK: Trouble deserializing file (Invalid File): Invalid diagnostics signature