Invalid memory access fix for ONNX split layer parser #24076#24101
Merged
asmorkalov merged 2 commits intoopencv:4.xfrom Aug 4, 2023
Merged
Invalid memory access fix for ONNX split layer parser #24076#24101asmorkalov merged 2 commits intoopencv:4.xfrom
asmorkalov merged 2 commits intoopencv:4.xfrom
Conversation
dkurt
reviewed
Aug 3, 2023
| slicePoints[i] = slicePoints[i - 1] + splitsBlob.at<int>(i); | ||
| } | ||
| layerParams.set("slice_point", DictValue::arrayInt(&slicePoints[0], slicePoints.size())); | ||
| if (slicePoints.size() == 0) |
Member
There was a problem hiding this comment.
Please check splitSize earlier:
int splitSize = splitsBlob.total();
if (splitSize == 1)
{
layerParams.set("num_split", 1);
}
else
{
std::vector<int> slicePoints(splitSize - 1, splitsBlob.at<int>(0));
for (int i = 1; i < splitSize - 1; ++i)
{
slicePoints[i] = slicePoints[i - 1] + splitsBlob.at<int>(i);
}
layerParams.set("slice_point", DictValue::arrayInt(&slicePoints[0], slicePoints.size()));
}
asmorkalov
reviewed
Aug 3, 2023
| slicePoints[i] = slicePoints[i - 1] + splitsBlob.at<int>(i); | ||
| } | ||
| layerParams.set("slice_point", DictValue::arrayInt(&slicePoints[0], slicePoints.size())); | ||
| if (slicePoints.size() == 0) |
Contributor
There was a problem hiding this comment.
slicePoints.empty() is better IMHO.
4 tasks
dkurt
approved these changes
Aug 4, 2023
fengyuentau
reviewed
Aug 4, 2023
Member
fengyuentau
left a comment
There was a problem hiding this comment.
Case split as attribute shares the same code. Is it possible to reduce duplicates? E.g. using lamda expressions?
auto fn = [&] (const vector<int> &splits) {
if (splits.size() == 1) {
// ...
} else {
// ...
}
}
Merged
thewoz
pushed a commit
to thewoz/opencv
that referenced
this pull request
Jan 4, 2024
Invalid memory access fix for ONNX split layer parser opencv#24076 opencv#24101 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work opencv#24076 - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
thewoz
pushed a commit
to thewoz/opencv
that referenced
this pull request
May 29, 2024
Invalid memory access fix for ONNX split layer parser opencv#24076 opencv#24101 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work opencv#24076 - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
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
4 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.
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.