Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2019-01-25 06:52:57 +0000
committerNathan Ridge2019-02-02 03:54:53 +0000
commit9290546e2ffc2184a08e0622a398d9c47bafed52 (patch)
tree6c00ba7d1e0fe78efd3a88bbe6b4eda5e983882e
parente5466b8204c8c903c36e43e0c9d5c4ea9d83a942 (diff)
downloadorg.eclipse.cdt-9290546e2ffc2184a08e0622a398d9c47bafed52.tar.gz
org.eclipse.cdt-9290546e2ffc2184a08e0622a398d9c47bafed52.tar.xz
org.eclipse.cdt-9290546e2ffc2184a08e0622a398d9c47bafed52.zip
Bug 543819 - NPE in EvalFunctionSet.isEquivalentTo()
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java
index f8eb1a08ceb..a53201a0d0e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java
@@ -167,6 +167,9 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
return false;
}
EvalFunctionSet o = (EvalFunctionSet) other;
+ if (fFunctionSet == null) {
+ return o.fFunctionSet == null;
+ }
return fFunctionSet.equals(o.fFunctionSet);
}

Back to the top