Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[22438] Arithmetic overflow in fragment size calculations (backport #5464) #5513

Merged
merged 1 commit into from
Dec 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2024

Description

This PR fixes an overflow in the WriterHistory and BaseWriter that occurred when the maximum message size was insufficient to accommodate the message's inherent headers.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.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.md file (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

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5464 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 18, 2024
Copy link
Contributor Author

mergify bot commented Dec 18, 2024

Cherry-pick of bfc5a53 has failed:

On branch mergify/bp/2.14.x/pr-5464
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit bfc5a530.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/history/WriterHistory.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   test/unittest/rtps/history/CMakeLists.txt
	new file:   test/unittest/rtps/history/WriterHistoryTests.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/cpp/rtps/writer/BaseWriter.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsListeners.cpp

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

@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Dec 18, 2024
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5464 branch from 6130510 to 411fc60 Compare December 19, 2024 14:49
@EugenioCollado EugenioCollado requested review from EugenioCollado and richiprosima and removed request for richiprosima and EugenioCollado December 19, 2024 15:04
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 19, 2024
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5464 branch from 0d42153 to 43fbb20 Compare December 20, 2024 09:47
@EugenioCollado EugenioCollado requested review from richiprosima and EugenioCollado and removed request for richiprosima December 20, 2024 09:48
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EugenioCollado EugenioCollado added skip-ci Automatically pass CI and removed ci-pending PR which CI is running labels Dec 23, 2024
@juanlofer-eprosima juanlofer-eprosima removed the request for review from richiprosima December 23, 2024 09:11
@EugenioCollado EugenioCollado merged commit 29ff526 into 2.14.x Dec 27, 2024
33 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5464 branch December 27, 2024 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants