Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-11 04:43:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

validate KeyPoint::convert indexes

Browse Source
This commit is contained in:
pbkx
2026-09-07 21:44:04 -07:00
parent 0c6b4a9b6d
commit 7c3880d0de
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/types.cpp
View File

@@ -79,12 +79,11 @@ void KeyPoint::convert(const std::vector<KeyPoint>& keypoints, std::vector<Point
for( size_t i = 0; i < keypointIndexes.size(); i++ )
{
int idx = keypointIndexes[i];
if( idx >= 0 )
if( idx >= 0 && static_cast<size_t>(idx) < keypoints.size() )
points2f[i] = keypoints[idx].pt;
else
{
CV_Error( cv::Error::StsBadArg, "keypointIndexes has element < 0. TODO: process this case" );
//points2f[i] = Point2f(-1, -1);
CV_Error( cv::Error::StsBadArg, "keypointIndexes has element out of range" );
}
}
}

52
modules/core/test/test_misc.cpp
View File

@@ -950,6 +950,58 @@ TEST(Core_Types, trivially_copyable_extra)
}
#endif
TEST(Core_KeyPoint, convert_rejects_negative_index)
{
const std::vector<KeyPoint> keypoints(1, KeyPoint(1, 2, 1));
const std::vector<int> indexes(1, -1);
std::vector<Point2f> points;
EXPECT_THROW(KeyPoint::convert(keypoints, points, indexes), cv::Exception);
}
TEST(Core_KeyPoint, convert_rejects_index_for_empty_input)
{
const std::vector<KeyPoint> keypoints;
const std::vector<int> indexes(1, 0);
std::vector<Point2f> points;
EXPECT_THROW(KeyPoint::convert(keypoints, points, indexes), cv::Exception);
}
TEST(Core_KeyPoint, convert_rejects_out_of_range_indexes)
{
const std::vector<KeyPoint> keypoints(1, KeyPoint(1, 2, 1));
std::vector<Point2f> points;
const int invalidIndexes[] = { 1, 100 };
for( size_t i = 0; i < sizeof(invalidIndexes) / sizeof(invalidIndexes[0]); i++ )
{
const std::vector<int> indexes(1, invalidIndexes[i]);
EXPECT_THROW(KeyPoint::convert(keypoints, points, indexes), cv::Exception);
}
}
TEST(Core_KeyPoint, convert_preserves_index_order_and_duplicates)
{
const std::vector<KeyPoint> keypoints = {
KeyPoint(1, 2, 1), KeyPoint(3, 4, 1), KeyPoint(5, 6, 1)
};
const std::vector<int> indexes = { 2, 0, 2, 1 };
std::vector<Point2f> points;
KeyPoint::convert(keypoints, points, indexes);
const Point2f expected[] = { Point2f(5, 6), Point2f(1, 2), Point2f(5, 6), Point2f(3, 4) };
ASSERT_EQ(sizeof(expected) / sizeof(expected[0]), points.size());
for( size_t i = 0; i < points.size(); i++ )
EXPECT_EQ(expected[i], points[i]);
KeyPoint::convert(keypoints, points);
ASSERT_EQ(keypoints.size(), points.size());
for( size_t i = 0; i < points.size(); i++ )
EXPECT_EQ(keypoints[i].pt, points[i]);
}
template <typename T> class Rect_Test : public testing::Test {};
TYPED_TEST_CASE_P(Rect_Test);