From 1bb098436fcad0b7fb312ff674e0f109226f8cb2 Mon Sep 17 00:00:00 2001 From: axel Date: Fri, 3 May 2013 22:41:58 +0200 Subject: [PATCH] Bug #404716 Avoid NPE Change-Id: I3eb03962a338fa628778c6d84ea1dd2ee615e3f4 Reviewed-on: https://git.eclipse.org/r/12510 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../internal/core/dom/parser/cpp/semantics/EvalBinary.java | 4 ++-- 1 file 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 79bd8aa5d78..ac126b9bfcf 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) {