From d5f6bfc0bd425709c5054e0c81a1c8e3a9a9daf0 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 9 Mar 2008 00:10:06 +0000 Subject: [PATCH] Protect against NPE in toString method. --- .../cdt/internal/core/dom/parser/cpp/CPPFunction.java | 6 +++++- .../cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java index ae013888c56..1f121e773d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java @@ -583,6 +583,10 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt @Override public String toString() { - return getName() + ASTTypeUtil.getParameterTypeString(getType()); //$NON-NLS-1$ + StringBuilder result = new StringBuilder(); + result.append(getName()); + IFunctionType t = getType(); + result.append(t != null ? ASTTypeUtil.getParameterTypeString(t) : "()"); //$NON-NLS-1$ + return result.toString(); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java index 6c0573e70d8..c32304e6d6e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java @@ -261,7 +261,9 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl @Override public String toString() { StringBuilder result = new StringBuilder(); - result.append(getName() + ASTTypeUtil.getParameterTypeString(getType())); + result.append(getName()); + IFunctionType t = getType(); + result.append(t != null ? ASTTypeUtil.getParameterTypeString(t) : "()"); //$NON-NLS-1$ try { result.append(" " + getConstantNameForValue(getLinkageImpl(), getNodeType())); //$NON-NLS-1$ } catch (CoreException e) {