[cfe-commits] r104474 - /cfe/trunk/tools/libclang/CIndex.cpp

[Douglas Gregor]

Author: dgregor
Date: Sun May 23 16:31:22 2010
New Revision: 104474

URL: http://llvm.org/viewvc/llvm-project?rev=104474&view=rev
Log:
Make clang_isFromMainFile() robust against NULL source locations.

Modified:
    cfe/trunk/tools/libclang/CIndex.cpp

Modified: cfe/trunk/tools/libclang/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=104474&r1=104473&r2=104474&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndex.cpp (original)
+++ cfe/trunk/tools/libclang/CIndex.cpp Sun May 23 16:31:22 2010
@@ -1481,6 +1481,9 @@
 
 unsigned clang_isFromMainFile(CXSourceLocation loc) {
   SourceLocation Loc = SourceLocation::getFromRawEncoding(loc.int_data);
+  if (!loc.ptr_data[0] || Loc.isInvalid())
+    return 0;
+
   const SourceManager &SM =
     *static_cast<const SourceManager*>(loc.ptr_data[0]);
   return SM.isFromMainFile(Loc) ? 1 : 0;