maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[demangler] Fix a bug in r328464 found by oss-fuzz. 

llvm-svn: 328507
This commit is contained in:
Erik Pilkington 2018-03-26 15:34:36 +00:00
parent 56f0fc4716
commit 615e753e09
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libcxxabi/src/cxa_demangle.cpp
View File

@ -1096,23 +1096,48 @@ struct ForwardTemplateReference : Node {
size_t Index;
Node *Ref = nullptr;
// If we're currently printing this node. It is possible (though invalid) for
// a forward template reference to refer to itself via a substitution. This
// creates a cyclic AST, which will stack overflow printing. To fix this, bail
// out if more than one print* function is active.
mutable bool Printing = false;
ForwardTemplateReference(size_t Index_)
: Node(KForwardTemplateReference, Cache::Unknown, Cache::Unknown,
Cache::Unknown),
Index(Index_) {}
bool hasRHSComponentSlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasRHSComponent(S);
}
bool hasArraySlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasArray(S);
}
bool hasFunctionSlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasFunction(S);
}
void printLeft(OutputStream &S) const override { Ref->printLeft(S); }
void printRight(OutputStream &S) const override { Ref->printRight(S); }
void printLeft(OutputStream &S) const override {
if (Printing)
return;
SwapAndRestore<bool> SavePrinting(Printing, true);
Ref->printLeft(S);
}
void printRight(OutputStream &S) const override {
if (Printing)
return;
SwapAndRestore<bool> SavePrinting(Printing, true);
Ref->printRight(S);
}
};
class NameWithTemplateArgs final : public Node {

29
llvm/lib/Demangle/ItaniumDemangle.cpp
View File

@ -1088,23 +1088,48 @@ struct ForwardTemplateReference : Node {
size_t Index;
Node *Ref = nullptr;
// If we're currently printing this node. It is possible (though invalid) for
// a forward template reference to refer to itself via a substitution. This
// creates a cyclic AST, which will stack overflow printing. To fix this, bail
// out if more than one print* function is active.
mutable bool Printing = false;
ForwardTemplateReference(size_t Index_)
: Node(KForwardTemplateReference, Cache::Unknown, Cache::Unknown,
Cache::Unknown),
Index(Index_) {}
bool hasRHSComponentSlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasRHSComponent(S);
}
bool hasArraySlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasArray(S);
}
bool hasFunctionSlow(OutputStream &S) const override {
if (Printing)
return false;
SwapAndRestore<bool> SavePrinting(Printing, true);
return Ref->hasFunction(S);
}
void printLeft(OutputStream &S) const override { Ref->printLeft(S); }
void printRight(OutputStream &S) const override { Ref->printRight(S); }
void printLeft(OutputStream &S) const override {
if (Printing)
return;
SwapAndRestore<bool> SavePrinting(Printing, true);
Ref->printLeft(S);
}
void printRight(OutputStream &S) const override {
if (Printing)
return;
SwapAndRestore<bool> SavePrinting(Printing, true);
Ref->printRight(S);
}
};
class NameWithTemplateArgs final : public Node {