Fixed result buffer overflow in intersectConvexConvex_ for non-convex input#25725
Merged
asmorkalov merged 1 commit intoopencv:4.xfrom Jun 16, 2024
Merged
Conversation
f7fceab to
1e81f0b
Compare
1e81f0b to
b9cfd09
Compare
b9cfd09 to
6623c62
Compare
Contributor
Author
|
@mshabunin @opencv-alalek any comment it this? |
mshabunin
reviewed
Jun 15, 2024
| std::vector<cv::Point> intersection; | ||
|
|
||
| float area = cv::intersectConvexConvex(convex1, convex2, intersection, false); | ||
| EXPECT_TRUE(intersection.empty()); |
Contributor
There was a problem hiding this comment.
What if intersection was non-empty before function call, will it be empty afterwards? Maybe we could check it here too.
Contributor
Author
There was a problem hiding this comment.
The function calls cv::OutputArray::release() for the "error" case, so it's always empty after the test call.
mshabunin
approved these changes
Jun 15, 2024
Contributor
mshabunin
left a comment
There was a problem hiding this comment.
Looks good to me! Just one minor comment/suggestion for the test.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #25259
The reproducer in the ticket is not valid. It uses non-convex inputs. The PR fixes uncontrolled buffer overflow to prevent crashes.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.