mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add assert to tf graph simplifier to address security concerns

Browse Source
This commit is contained in:
rogday 2022-04-13 15:55:36 +03:00
parent 3a595ea5c4
commit a2b84e9897
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
View File

@ -1035,7 +1035,7 @@ void sortByExecutionOrder(tensorflow::GraphDef& net)
nodesToAdd.pop_back(); nodesToAdd.pop_back();
permIds.push_back(nodeToAdd); permIds.push_back(nodeToAdd);
CV_Assert(nodeToAdd < edges.size());
for (int i = 0; i < edges[nodeToAdd].size(); ++i) for (int i = 0; i < edges[nodeToAdd].size(); ++i)
{ {
int consumerId = edges[nodeToAdd][i]; int consumerId = edges[nodeToAdd][i];

7
modules/dnn/test/test_tf_importer.cpp
View File

@ -1571,6 +1571,13 @@ TEST_P(Test_TensorFlow_layers, tf2_permute_nhwc_ncwh)
runTensorFlowNet("tf2_permute_nhwc_ncwh"); runTensorFlowNet("tf2_permute_nhwc_ncwh");
} }
// issue #21852
TEST_P(Test_TensorFlow_layers, tf_graph_simplifier_buffer_overflow)
{
// This just shouldn't segfault, otherwise it's fine
EXPECT_ANY_THROW(readNetFromTensorflow(path("tf_graph_simplifier_buffer_overflow_net.pb")));
}
TEST_P(Test_TensorFlow_layers, squeeze) TEST_P(Test_TensorFlow_layers, squeeze)
{ {
#if defined(INF_ENGINE_RELEASE) #if defined(INF_ENGINE_RELEASE)