summaryrefslogtreecommitdiffstats
path: root/clang/lib/Basic
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-08-17 00:55:32 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-08-17 00:55:32 +0000
commit99eff01fa2d9debfdad290e300c7d013c2fa03da (patch)
tree0e27e36b8e4a4ca47006e269f7d8da434d303c16 /clang/lib/Basic
parent39fc5b42a61d03a8920beb3ceba77d661a282247 (diff)
downloadbcm5719-llvm-99eff01fa2d9debfdad290e300c7d013c2fa03da.tar.gz
bcm5719-llvm-99eff01fa2d9debfdad290e300c7d013c2fa03da.zip
Avoid binding a reference to a dereferenced null pointer, if we try to emit a
diagnostic before we have a source manager. llvm-svn: 162070
Diffstat (limited to 'clang/lib/Basic')
-rw-r--r--clang/lib/Basic/Diagnostic.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index 2c49c2f7606..8065b2d98f3 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -145,6 +145,9 @@ DiagnosticsEngine::GetDiagStatePointForLoc(SourceLocation L) const {
assert(DiagStatePoints.front().Loc.isInvalid() &&
"Should have created a DiagStatePoint for command-line");
+ if (!SourceMgr)
+ return DiagStatePoints.end() - 1;
+
FullSourceLoc Loc(L, *SourceMgr);
if (Loc.isInvalid())
return DiagStatePoints.end() - 1;
OpenPOWER on IntegriCloud