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 double-locking issue in DataSharingListener (backport #5468) #5522

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2024

Description

In the run() function of DataSharingListener, due to time jumps, the wait() function may occasionally experience spurious wakeups and throw a const boost::interprocess_exception. After executing continue in the catch block, the code attempts to lock the mutex again while it's already locked, which leads to a std::system_error exception being thrown(e.what(): Resource deadlock avoided), ultimately causing the program to crash.

图片1

未命名文件 (5)

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

@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Dec 20, 2024
@EugenioCollado EugenioCollado self-requested a review December 27, 2024 08:23
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 27, 2024
@eProsima eProsima deleted a comment from mergify bot Dec 27, 2024
@EugenioCollado
Copy link
Contributor

https://github.com/Mergifyio rebase

Signed-off-by: Xiaojing Cao <[email protected]>
(cherry picked from commit 059457a)
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5468 branch from cca8d1a to 201d625 Compare December 27, 2024 10:03
Copy link
Contributor Author

mergify bot commented Dec 27, 2024

rebase

✅ Branch has been successfully rebased

@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed ci-pending PR which CI is running labels Dec 27, 2024
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 merged commit 3b0c821 into 2.14.x Dec 30, 2024
18 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5468 branch December 30, 2024 10:10
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.

3 participants