From c8b23ec2d787b890d4db235fc2ceae4a0ed4fc7d Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Fri, 14 Apr 2017 20:23:49 -0400
Subject: [PATCH] Bug 513597 - NPE in DestructorCollector.addDestructorCall()

Change-Id: Ibf971013d1f9e65405a31a1f48c2e4c99731a381
---
 .../dom/parser/cpp/semantics/DestructorCallCollector.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/DestructorCallCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/DestructorCallCollector.java
index 53f0e6b196a..e270bcf2a55 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/DestructorCallCollector.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/DestructorCallCollector.java
@@ -185,7 +185,9 @@ public class DestructorCallCollector {
 								IType type = SemanticUtil.getNestedType(var.getType(), TDEF | CVTYPE);
 								if (type instanceof ICPPClassType) {
 									ICPPMethod destructor = findDestructor((ICPPClassType) type, name);
-									addDestructorCall(name, destructor);
+									if (destructor != null) {
+										addDestructorCall(name, destructor);
+									}
 								} else if (type instanceof ICPPReferenceType) {
 									IASTDeclarator decl = (IASTDeclarator) name.getParent();
 									addDestructorCallForTemporaryBoundToReference(decl);