[21751] Discard changes with big key-only payload and no key hash (backport #5262) #5276
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Refs #21707. Regression test. Signed-off-by: Miguel Company <[email protected]> * Refs #21707. Test both best_effort and reliable. Signed-off-by: Miguel Company <[email protected]> * Refs #21707. Fix by considering offending change as irrelevant. Signed-off-by: Miguel Company <[email protected]> * Refs #21707. Refactor code in MessageReceiver. Signed-off-by: Miguel Company <[email protected]> * Refs #21707. Avoid overriding instanceHandle. Signed-off-by: Miguel Company <[email protected]> * Refs #21707. Add TODO so we don't forget to correctly process key-only payloads in the future. Signed-off-by: Miguel Company <[email protected]> * Refs #21751. Document and improve code in `change_is_relevant_for_filter`. Signed-off-by: Miguel Company <[email protected]> * Refs #21751. Document else. Signed-off-by: Miguel Company <[email protected]> * Refs #21751. Added static assertions for structure sizes. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit 175add5) # Conflicts: # src/cpp/rtps/messages/MessageReceiver.cpp # test/blackbox/common/BlackboxTestsTransportUDP.cpp
|
Cherry-pick of 175add5 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
12 tasks
|
@MiguelCompany would you mind addressing the conflicts here ? |
Signed-off-by: Miguel Company <[email protected]>
Mario-DL
reviewed
Oct 3, 2024
Signed-off-by: Mario Dominguez <[email protected]>
Mario-DL
approved these changes
Oct 4, 2024
Mario-DL
added
ready-to-merge
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.
Description
We currently don't have support for key-only payloads bigger than the KEY_HASH length.
Receiving such kind of messages produces a segfault in DataReaderHistory.
This PR adds a regression test reproducing the issue, and fixes it by considering the incoming change as irrelevant.
It has been done this way so it is acknowledged in reliable topics, thus avoiding the offending data to be resent.
@Mergifyio backport 2.14.x 2.10.x
@Mergifyio backport 2.6.x
Contributor Checklist
Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A: Any new/modified methods have been properly documented using Doxygen.
N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
N/A: New feature has been added to the
versions.mdfile (if applicable).N/A: New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #5262 done by [Mergify](https://mergify.com).