diff options
-rw-r--r-- | clang/lib/Frontend/SerializedDiagnosticReader.cpp | 3 | ||||
-rw-r--r-- | clang/test/Index/Inputs/empty.dia | 0 | ||||
-rw-r--r-- | clang/test/Index/read-empty-diags.test | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Frontend/SerializedDiagnosticReader.cpp b/clang/lib/Frontend/SerializedDiagnosticReader.cpp index 8a8161488f4..08b7087fbad 100644 --- a/clang/lib/Frontend/SerializedDiagnosticReader.cpp +++ b/clang/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' || diff --git a/clang/test/Index/Inputs/empty.dia b/clang/test/Index/Inputs/empty.dia new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Index/Inputs/empty.dia diff --git a/clang/test/Index/read-empty-diags.test b/clang/test/Index/read-empty-diags.test new file mode 100644 index 00000000000..cef751c920a --- /dev/null +++ b/clang/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 |