Fix WarpPerspective::GetFillValue. #5575
Merged
Conversation
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
Add more error checks. Minor style fixes and improved structure packing. Signed-off-by: Michal Zientkiewicz <[email protected]>
mzient
commented
Jul 22, 2024
| std::vector<float> fill_value_arg_{0, 0, 0, 0}; | ||
| float4 fill_value_{0, 0, 0, 0}; | ||
| float4 fill_value_; | ||
| bool inverse_map_ = false; |
There was a problem hiding this comment.
Putting small fields next to one another improves structure packing.
mzient
commented
Jul 22, 2024
Comment on lines
+165
to
+166
| if (channels > 4) | ||
| DALI_FAIL("Images with more than 4 channels are not supported."); |
There was a problem hiding this comment.
We use float4 for fill_value.
|
CI MESSAGE: [16804669]: BUILD STARTED |
mzient
commented
Jul 22, 2024
| @@ -108,16 +108,16 @@ class WarpPerspective : public nvcvop::NVCVSequenceOperator<StatelessOperator> { | |||
| float4 GetFillValue(int channels) const { | |||
| if (fill_value_arg_.size() > 1) { | |||
| if (channels > 0) { | |||
| if (channels == static_cast<int>(fill_value_arg_.size())) { | |||
| float4 fill_value{0, 0, 0, 0}; | |||
| memcpy(&fill_value, fill_value_arg_.data(), sizeof(decltype(fill_value))); | |||
There was a problem hiding this comment.
The bug is in this line - fill_value_arg_ is constructed with exact length in line 95, overriding the default constructor from 233, which is never used. This leads to invalid read of size 16, which is up to 12 bytes beyond the vector end.
jantonguirao
approved these changes
Jul 22, 2024
mdabek-nvidia
approved these changes
Jul 22, 2024
|
CI MESSAGE: [16804669]: BUILD PASSED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Category:
Bug fix (non-breaking change which fixes an issue)
Refactoring (Redesign of existing code that doesn't affect functionality)
Description:
Fix copying FillValue - use actual number of elements in the vector.
Check that the number of channels doesn't exceed 4 (CV-CUDA limit).
Minor style fixes and improved structure packing.
Additional information:
Affected modules and functionalities:
Key points relevant for the review:
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: DALI-4041