From 52d90b84b2a4514bf061a8b7714bc623682c6b2d Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Tue, 20 Jul 2010 10:42:25 +0000
Subject: [PATCH] Bug 319749: NPE during content assist.

---
 .../internal/core/dom/parser/cpp/semantics/CPPVisitor.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/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index 6efcb99c90d..206e91eb39e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -1694,7 +1694,9 @@ public class CPPVisitor extends ASTQueries {
 		IASTDeclSpecifier pDeclSpec = pdecl.getDeclSpecifier();
 		ICPPASTDeclarator pDtor = pdecl.getDeclarator();
 		pt = createType(pDeclSpec);
-		pt = createType(pt, pDtor);
+		if (pDtor != null) {
+			pt = createType(pt, pDtor);
+		}
 		pt=  adjustParameterType(pt, forFuncType);
 		
 		if (pt != null && CPPVisitor.findInnermostDeclarator(pDtor).declaresParameterPack()) {