Skip to content

[25475] Several fixes in TopicPayloadPool (backport #6462, backport #3606)#6464

Merged
MiguelCompany merged 4 commits into
2.6.xfrom
mergify/bp/2.6.x/pr-6460
Jul 6, 2026
Merged

[25475] Several fixes in TopicPayloadPool (backport #6462, backport #3606)#6464
MiguelCompany merged 4 commits into
2.6.xfrom
mergify/bp/2.6.x/pr-6460

Conversation

@mergify

@mergify mergify Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Description

Fixes a common misuse of std::nothrow. Calling new (std::nothrow) T() only avoids throwing when allocating T, but exceptions thrown when executing T's constructor are not avoided.

This fixes the problem by capturing std::bad_alloc when creating the node.

A regression test is also added.

@Mergifyio backport 3.2.x 2.14.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

  • 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.
  • N/A: 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 #6460 done by [Mergify](https://mergify.com).

@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Jul 3, 2026
@mergify

mergify Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 31ece6f has failed:

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

You are currently cherry-picking commit 31ece6fdc.
  (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/TopicPayloadPool.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/history/TopicPayloadPool.hpp
	both modified:   test/unittest/rtps/history/TopicPayloadPoolTests.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

…#3606)

* Refs #13608: unittests dynamic memory topic payload with zero size

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #13608: BB test discovery issue #1929

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #13608: Fix

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #13608: Reviewer change

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 6726896)
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jul 3, 2026
@MiguelCompany MiguelCompany added this to the v2.6.12 milestone Jul 3, 2026
@MiguelCompany
MiguelCompany force-pushed the mergify/bp/2.6.x/pr-6460 branch 2 times, most recently from 51f1dc9 to 0d10336 Compare July 3, 2026 07:57
@MiguelCompany
MiguelCompany self-requested a review July 3, 2026 07:59
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jul 3, 2026
@MiguelCompany MiguelCompany changed the title [25475] Catch exception when constructing a payload pool Node (backport #6460) [25475] Several fixes in TopicPayloadPool (backport #6460, backport #3606) Jul 3, 2026
mergify Bot and others added 2 commits July 3, 2026 10:37
* Refs #25475. Regression test.

* Refs #25475. Capture exception when constructing PayloadNode.

* Refs #25475. Bonus: avoid using sizeof(NodeInfo).

* Refs #25475. Fix uncrustify.

---------

(cherry picked from commit 31ece6f)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
MiguelCompany force-pushed the mergify/bp/2.6.x/pr-6460 branch from 0d10336 to 766eb24 Compare July 3, 2026 08:38
@MiguelCompany
MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany July 3, 2026 08:38
@MiguelCompany MiguelCompany changed the title [25475] Several fixes in TopicPayloadPool (backport #6460, backport #3606) [25475] Several fixes in TopicPayloadPool (backport #6462, backport #3606) Jul 3, 2026
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany July 3, 2026 09:18
@MiguelCompany
MiguelCompany merged commit a4880b1 into 2.6.x Jul 6, 2026
17 of 22 checks passed
@MiguelCompany
MiguelCompany deleted the mergify/bp/2.6.x/pr-6460 branch July 6, 2026 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants