Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2015-09-27 14:31:06 -0400
committerNathan Ridge2015-09-27 14:31:06 -0400
commit7ba4959cf4293cbd17726f22b49d89c6bc444b04 (patch)
tree865ea02b30a71d8d657595272d9984d382a4b1a2
parent15935286c08473ff39a1072a29173adc9b0465a9 (diff)
downloadorg.eclipse.cdt-7ba4959cf4293cbd17726f22b49d89c6bc444b04.tar.gz
org.eclipse.cdt-7ba4959cf4293cbd17726f22b49d89c6bc444b04.tar.xz
org.eclipse.cdt-7ba4959cf4293cbd17726f22b49d89c6bc444b04.zip
Bug 477231 - NPE in CPPTemplates.convertNonTypeTemplateArgument()
Change-Id: If018f3d40f46eaccfaa9b8fb0094dbf40f50e599 Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java2
1 files changed, 1 insertions, 1 deletions
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 00098cb8dd..f58bd1af77 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;
}

Back to the top