Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2018-02-13 03:36:01 +0000
committerNathan Ridge2018-02-22 23:25:18 +0000
commit337ba422b6e83dfbe683261e7ed539ba240e77cc (patch)
treeeb85450553fbedc8a0216effe2060a002e510351
parent99e842bc6e0fa2c77308b6e75ee97f0843e2e924 (diff)
downloadorg.eclipse.cdt-337ba422b6e83dfbe683261e7ed539ba240e77cc.tar.gz
org.eclipse.cdt-337ba422b6e83dfbe683261e7ed539ba240e77cc.tar.xz
org.eclipse.cdt-337ba422b6e83dfbe683261e7ed539ba240e77cc.zip
Bug 531076 - NPE in CSearchQuery.createMatchesFromNames()
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java
index 6af1e195c9..011644dc6f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java
@@ -234,6 +234,9 @@ public abstract class CSearchQuery implements ISearchQuery {
if (!filterName(name)) {
if (!isPolymorphicOnly || name.couldBePolymorphicMethodCall()) {
IASTFileLocation loc = name.getFileLocation();
+ if (loc == null) {
+ continue;
+ }
IIndexFile file = name.getFile();
Set<Match> matches = fileMatches.get(file);
if (matches == null) {

Back to the top