From 093466adabd0e68c13cdf1f6f8f62a98563f162d Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 19 Apr 2006 15:41:46 +0000 Subject: [PATCH] Fix 137463 NPE in addName when the name.toCharArray() was null for anonymous declarations. --- .../cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index e1d859e7c57..6701f20fb39 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -97,8 +97,12 @@ public class PDOMCPPLinkage extends PDOMLinkage { } public PDOMBinding addName(IASTName name) throws CoreException { - if (name == null || name.toCharArray().length == 0 - || name instanceof ICPPASTQualifiedName) + if (name == null || name instanceof ICPPASTQualifiedName) + return null; + + // Check for null name + char[] namechars = name.toCharArray(); + if (namechars == null || namechars.length == 0) return null; IBinding binding = name.resolveBinding();