mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-30 04:15:35 +02:00
Code Issues Wiki Activity

More protection against infinite recursion in CPPTeplateSpecialization, bug 231742.

Browse source
This commit is contained in:
Sergey Prigogin 2008-06-02 08:45:57 +00:00
parent def81d5ae0
commit 6876e4ff00
2 changed files with 33 additions and 13 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

@ -36,7 +36,7 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
} }
} }
static final int MAX_RESOLUTION_DEPTH = 5; public static final int MAX_RESOLUTION_DEPTH = 5;
private IType type; private IType type;
private int fResolutionDepth; private int fResolutionDepth;
@ -59,22 +59,31 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
*/ */
public IType getType() throws DOMException { public IType getType() throws DOMException {
if (type == null) { if (type == null) {
if (++fResolutionDepth > MAX_RESOLUTION_DEPTH) { try {
type = new RecursionResolvingBinding(getDefinition(), getNameCharArray()); if (++fResolutionDepth > MAX_RESOLUTION_DEPTH) {
} else {
type = CPPTemplates.instantiateType(getTypedef().getType(), argumentMap, getScope());
// A typedef pointing to itself is a sure recipe for an infinite loop -- replace
// with a problem binding.
if (type instanceof CPPTypedefSpecialization &&
((CPPTypedefSpecialization) type).getSpecializedBinding().equals(getSpecializedBinding()) &&
((CPPTypedefSpecialization) type).getArgumentMap().isEquivalent(argumentMap, IType.TYPE_MATCHER)) {
type = new RecursionResolvingBinding(getDefinition(), getNameCharArray()); type = new RecursionResolvingBinding(getDefinition(), getNameCharArray());
} } else {
type = CPPTemplates.instantiateType(getTypedef().getType(), argumentMap, getScope());
// A typedef pointing to itself is a sure recipe for an infinite loop -- replace
// with a problem binding.
if (type instanceof CPPTypedefSpecialization &&
((CPPTypedefSpecialization) type).getSpecializedBinding().equals(getSpecializedBinding()) &&
((CPPTypedefSpecialization) type).getArgumentMap().isEquivalent(argumentMap, IType.TYPE_MATCHER)) {
type = new RecursionResolvingBinding(getDefinition(), getNameCharArray());
}
}
} finally {
--fResolutionDepth;
} }
} }
return type; return type;
} }
public int incResolutionDepth(int increment) {
fResolutionDepth += increment;
return fResolutionDepth;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#clone() * @see java.lang.Object#clone()
*/ */

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java
View file

@ -18,6 +18,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
import org.eclipse.cdt.internal.core.Util; import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTypedefSpecialization;
import org.eclipse.cdt.internal.core.index.CPPTypedefClone; import org.eclipse.cdt.internal.core.index.CPPTypedefClone;
import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants; import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;
import org.eclipse.cdt.internal.core.index.IIndexType; import org.eclipse.cdt.internal.core.index.IIndexType;
@ -28,12 +29,10 @@ import org.eclipse.core.runtime.CoreException;
/** /**
* @author Bryan Wilkinson * @author Bryan Wilkinson
*
*/ */
class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization
implements ITypedef, ITypeContainer, IIndexType { implements ITypedef, ITypeContainer, IIndexType {
private static final int TYPE = PDOMCPPSpecialization.RECORD_SIZE + 0; private static final int TYPE = PDOMCPPSpecialization.RECORD_SIZE + 0;
@SuppressWarnings("hiding") @SuppressWarnings("hiding")
@ -44,12 +43,24 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization
super(pdom, parent, (ICPPSpecialization) typedef, specialized); super(pdom, parent, (ICPPSpecialization) typedef, specialized);
try { try {
if (typedef instanceof CPPTypedefSpecialization) {
if (((CPPTypedefSpecialization) typedef).incResolutionDepth(1) >
CPPTypedefSpecialization.MAX_RESOLUTION_DEPTH) {
return;
}
}
IType type = typedef.getType(); IType type = typedef.getType();
// The following may try to add the same typedef specialization to the index again.
// We protect against infinite recursion using a counter inside typedef.
PDOMNode typeNode = parent.getLinkageImpl().addType(this, type); PDOMNode typeNode = parent.getLinkageImpl().addType(this, type);
if (typeNode != null) if (typeNode != null)
pdom.getDB().putInt(record + TYPE, typeNode.getRecord()); pdom.getDB().putInt(record + TYPE, typeNode.getRecord());
} catch (DOMException e) { } catch (DOMException e) {
throw new CoreException(Util.createStatus(e)); throw new CoreException(Util.createStatus(e));
} finally {
if (typedef instanceof CPPTypedefSpecialization) {
((CPPTypedefSpecialization) typedef).incResolutionDepth(-1);
}
} }
} }