mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

Patch for Bryan 178222 addressing NPEs while indexing Firefox.

Browse source
This commit is contained in:
Doug Schaefer 2007-03-20 14:41:26 +00:00
parent f56c912aeb
commit 777bb96452
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java
View file

@ -110,7 +110,8 @@ class PDOMCPPClassTemplatePartialSpecialization extends
public void addArgument(IType type) throws CoreException { public void addArgument(IType type) throws CoreException {
PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + ARGUMENTS, getLinkageImpl()); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + ARGUMENTS, getLinkageImpl());
PDOMNode typeNode = getLinkageImpl().addType(this, type); PDOMNode typeNode = getLinkageImpl().addType(this, type);
list.addMember(typeNode); if (typeNode != null)
list.addMember(typeNode);
} }
private static class TemplateArgumentCollector implements IPDOMVisitor { private static class TemplateArgumentCollector implements IPDOMVisitor {

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPInstance.java
View file

@ -47,7 +47,8 @@ abstract class PDOMCPPInstance extends PDOMCPPSpecialization implements
IType[] args = inst.getArguments(); IType[] args = inst.getArguments();
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
PDOMNode typeNode = getLinkageImpl().addType(this, args[i]); PDOMNode typeNode = getLinkageImpl().addType(this, args[i]);
list.addMember(typeNode); if (typeNode != null)
list.addMember(typeNode);
} }
} }

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java
View file

@ -56,9 +56,11 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements
if (argMap != null) { if (argMap != null) {
for (int i = 0; i < argMap.size(); i++) { for (int i = 0; i < argMap.size(); i++) {
PDOMNode paramNode = getLinkageImpl().addType(this, (IType) argMap.keyAt(i)); PDOMNode paramNode = getLinkageImpl().addType(this, (IType) argMap.keyAt(i));
paramList.addMember(paramNode);
PDOMNode argNode = getLinkageImpl().addType(this, (IType) argMap.getAt(i)); PDOMNode argNode = getLinkageImpl().addType(this, (IType) argMap.getAt(i));
argList.addMember(argNode); if (paramNode != null && argNode != null) {
paramList.addMember(paramNode);
argList.addMember(argNode);
}
} }
} }
try { try {