From 7ba4959cf4293cbd17726f22b49d89c6bc444b04 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Sun, 27 Sep 2015 14:31:06 -0400 Subject: [PATCH] Bug 477231 - NPE in CPPTemplates.convertNonTypeTemplateArgument() Change-Id: If018f3d40f46eaccfaa9b8fb0094dbf40f50e599 Signed-off-by: Nathan Ridge --- .../internal/core/dom/parser/cpp/semantics/CPPTemplates.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java index 00098cb8ddf..f58bd1af778 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java @@ -2597,7 +2597,7 @@ public class CPPTemplates { p = new CPPPointerType(((IArrayType) paramType).getType()); } else { p= paramType; - if (p.isSameType(a)) + if (p != null && p.isSameType(a)) return arg; }