summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxel2013-05-03 16:41:58 (EDT)
committer Sergey Prigogin2013-05-03 17:00:05 (EDT)
commit1bb098436fcad0b7fb312ff674e0f109226f8cb2 (patch)
treef49bc516adc52d10e77c5f2f1621ee3cb54cf23e
parent64121887a964bd53cdaa97b2b5d01beae46c8ab9 (diff)
downloadorg.eclipse.cdt-1bb098436fcad0b7fb312ff674e0f109226f8cb2.zip
org.eclipse.cdt-1bb098436fcad0b7fb312ff674e0f109226f8cb2.tar.gz
org.eclipse.cdt-1bb098436fcad0b7fb312ff674e0f109226f8cb2.tar.bz2
Avoid NPE Change-Id: I3eb03962a338fa628778c6d84ea1dd2ee615e3f4 Reviewed-on: https://git.eclipse.org/r/12510 Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com> IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com> Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java
index 79bd8aa..ac126b9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalBinary.java
@@ -140,10 +140,10 @@ public class EvalBinary extends CPPDependentEvaluation {
}
IValue v1 = fArg1.getValue(point);
- if (v1 == Value.UNKNOWN)
+ if (v1 == null || v1 == Value.UNKNOWN)
return Value.UNKNOWN;
IValue v2 = fArg2.getValue(point);
- if (v2 == Value.UNKNOWN)
+ if (v2 == null || v2 == Value.UNKNOWN)
return Value.UNKNOWN;
switch (fOperator) {