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

Added missing protection during liveliness assertion <master> #2801

Merged
merged 2 commits into from
Jul 4, 2022

Conversation

jsan-rt
Copy link
Contributor

@jsan-rt jsan-rt commented Jul 1, 2022

Signed-off-by: Javier Santiago javiersantiago@eprosima.com

Conversation is located here: #2794

Description

Added missing protection during liveliness assertion. This may cause erroneous memory access in some cases.

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.
  • Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • Documentation builds and tests pass locally.
  • New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
…clarify intent

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt jsan-rt added this to the v2.7.0 milestone Jul 1, 2022
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany
Copy link
Member

@richiprosima Please test this

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 275fb3d into master Jul 4, 2022
@EduPonz
Copy link

EduPonz commented Jul 6, 2022

@Mergifyio backport 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Jul 6, 2022

backport 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 6, 2022
* Added missing pretection during assert_liveliness

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Changed unique_locks to lock_guards where applicable to our issue to clarify intent

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit 275fb3d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants