fix the infinite loop in tf importer of 3.4 branch

This commit is contained in:
zihaomu 2022-11-15 11:42:10 +08:00
parent 2991717191
commit 5bf64e7dfe

View File

@ -829,12 +829,19 @@ void RemoveIdentityOps(tensorflow::GraphDef& net)
IdentityOpsMap::iterator it = identity_ops.find(input_op_name);
if (it != identity_ops.end()) {
std::set<String> loopCheckSet;
// In case of Identity after Identity
while (true)
{
IdentityOpsMap::iterator nextIt = identity_ops.find(it->second);
if (nextIt != identity_ops.end())
{
// Loop check
if (loopCheckSet.find(it->second) != loopCheckSet.end())
CV_Error(Error::StsError, "Found a loop in your input Tensorflow model, which is illegal!");
loopCheckSet.insert(it->second);
it = nextIt;
}
else
break;
}