From e2e1f585eb1b261e4788aabd4456a6d8e8a49f6c Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Tue, 5 Apr 2005 17:27:56 +0000
Subject: [PATCH] Fixed Bug 87811 - [Parser] NPE found in
 ASTNode#getNodeLocations() with problematic KnR C

---
 .../parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java | 4 +++-
 .../org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java | 3 ++-
 .../org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java  | 3 ++-
 .../cdt/internal/core/dom/parser/c/GNUCSourceParser.java      | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
index ac017152873..0a84b0506bc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTSignatureUtil.java
@@ -142,7 +142,9 @@ public class ASTSignatureUtil {
 			
 			for(int i=0; i<names.length; i++) {
 				if (names[i] != null) {
-					result[i] = getSignature(((ICASTKnRFunctionDeclarator)decltor).getDeclaratorForParameterName(names[i]));
+					final IASTDeclarator declaratorForParameterName = ((ICASTKnRFunctionDeclarator)decltor).getDeclaratorForParameterName(names[i]);
+                    if( declaratorForParameterName != null )
+                        result[i] = getSignature(declaratorForParameterName);
 				}
 			}
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
index 8f1ad594300..50d3b367cb1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
@@ -220,7 +220,8 @@ public class CFunction implements IFunction, ICInternalBinding {
         			break;
         	}
         	knrParamDtor = CVisitor.getKnRParameterDeclarator( fKnRDtor, paramName );
-        	paramName = knrParamDtor.getName();
+            if( knrParamDtor != null )
+                paramName = knrParamDtor.getName();
     	}
     	
     	//create a new binding and set it for the corresponding parameter in all known defns and decls
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
index 58307f72cb6..b08a538cd5f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
@@ -1601,7 +1601,8 @@ public class CVisitor {
 			
 		    for( int i = 0; i < parms.length; i++ ){
 		        IASTDeclarator dtor = getKnRParameterDeclarator( (ICASTKnRFunctionDeclarator) decltor, parms[i] );
-		        parmTypes[i] = createType( dtor );
+                if( dtor != null )
+                    parmTypes[i] = createType( dtor );
 		    }
 		    return parmTypes;
 		} else {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
index ba8852fc2a7..0e27ef08368 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
@@ -1910,8 +1910,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
             ICASTKnRFunctionDeclarator functionDecltor = createKnRFunctionDeclarator();
             parmDeclarations = removeNullDeclarations(parmDeclarations);
             for (int i = 0; i < parmDeclarations.length; ++i) {
-                if (parmDeclarations[i] != null
-                        && !(parmDeclarations[i] instanceof IASTProblemDeclaration)) {
+                if (parmDeclarations[i] != null) {
                     parmDeclarations[i].setParent(functionDecltor);
                     parmDeclarations[i]
                             .setPropertyInParent(ICASTKnRFunctionDeclarator.FUNCTION_PARAMETER);