mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 328380: Improved safeguard against infinite recursion.

Browse source
This commit is contained in:
Markus Schorn 2010-11-04 16:16:04 +00:00
parent fdfbe1e62c
commit ff18b15fdb
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java
View file

@ -35,7 +35,7 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
}
public static final int MAX_RESOLUTION_DEPTH = 5;
public static final int MAX_TYPE_NESTING = 100;
public static final int MAX_TYPE_NESTING = 60;
private IType type;
private int fResolutionDepth;
@ -53,6 +53,10 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
* @see org.eclipse.cdt.core.dom.ast.ITypedef#getType()
*/
public IType getType() {
return getType(MAX_TYPE_NESTING);
}
private IType getType(int maxDepth) {
if (type == null) {
try {
if (++fResolutionDepth > MAX_RESOLUTION_DEPTH) {
@ -61,13 +65,8 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
type= specializeType(getTypedef().getType());
// A typedef pointing to itself is a sure recipe for an infinite loop -- replace
// with a problem binding.
IType checkType= type;
for (int i = 0; checkType instanceof ITypeContainer; i++) {
if (this.equals(checkType) || i == MAX_TYPE_NESTING) {
type = new RecursionResolvingBinding(getDefinition(), getNameCharArray());
break;
}
checkType= ((ITypeContainer) checkType).getType();
if (!verifyType(type, maxDepth)) {
type = new RecursionResolvingBinding(getDefinition(), getNameCharArray());
}
}
} finally {
@ -77,6 +76,22 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
return type;
}
private boolean verifyType(IType type, int maxTypeNesting) {
for (;;) {
if (--maxTypeNesting < 0)
return false;
if (equals(type))
return false;
if (type instanceof CPPTypedefSpecialization) {
type= ((CPPTypedefSpecialization) type).getType(maxTypeNesting);
} else if (type instanceof ITypeContainer) {
type= ((ITypeContainer) type).getType();
} else {
return true;
}
}
}
public int incResolutionDepth(int increment) {
fResolutionDepth += increment;
return fResolutionDepth;