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

Fix segfault when creating two participant with same fixed id [18051] (backport #3443) #3629

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2023

This is an automatic backport of pull request #3443 done by Mergify.
Cherry-pick of 3a168ed has failed:

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

You are currently cherry-picking commit 3a168ed6f.
  (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/fastdds/domain/DomainParticipantFactory.cpp
	modified:   test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
	modified:   test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp
	modified:   test/unittest/dds/participant/ParticipantTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/domain/DomainParticipantImpl.cpp
	both modified:   src/cpp/rtps/RTPSDomain.cpp
	both modified:   src/cpp/rtps/RTPSDomainImpl.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #18050. Add regression test

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18050. Fix segfault

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Apply suggestions from code review

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18050. Apply suggestions

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18050. improvement regression test

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Apply suggestions from code review

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #18051. Apply suggestions.

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18051. Fix mock

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18051. Fix statistics mock

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18051. Fix uncrustify

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #18051. Fix memory leak

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 3a168ed)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantImpl.cpp
#	src/cpp/rtps/RTPSDomain.cpp
#	src/cpp/rtps/RTPSDomainImpl.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 27, 2023
@mergify mergify bot deleted the mergify/bp/2.6.x/pr-3443 branch June 27, 2023 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants