mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Protect against an NPE.

Browse source
This commit is contained in:
Sergey Prigogin 2015-06-03 18:18:57 -07:00
parent 4cf72bb41b
commit 4890e6e7e6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java
View file

@ -80,6 +80,10 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding {
return null; return null;
} }
/**
* Returns the template arguments, or {@code null} if the function set doesn't represent a template
* specialization.
*/
public ICPPTemplateArgument[] getTemplateArguments() { public ICPPTemplateArgument[] getTemplateArguments() {
return fTemplateArguments; return fTemplateArguments;
} }

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java
View file

@ -332,8 +332,10 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
int r = CPPTemplates.PACK_SIZE_NOT_FOUND; int r = CPPTemplates.PACK_SIZE_NOT_FOUND;
if (fFunctionSet != null) { if (fFunctionSet != null) {
ICPPTemplateArgument[] templateArguments = fFunctionSet.getTemplateArguments(); ICPPTemplateArgument[] templateArguments = fFunctionSet.getTemplateArguments();
for (ICPPTemplateArgument arg : templateArguments) { if (templateArguments != null) {
r = CPPTemplates.combinePackSize(r, CPPTemplates.determinePackSize(arg, tpMap)); for (ICPPTemplateArgument arg : templateArguments) {
r = CPPTemplates.combinePackSize(r, CPPTemplates.determinePackSize(arg, tpMap));
}
} }
} }
return r; return r;