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

[16360] Protect from uncaught exception during SHM Segment creation. (backport #3293) #3331

Merged
merged 1 commit into from
Apr 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 28, 2023

This is an automatic backport of pull request #3293 done by Mergify.


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

* Added regression test

Signed-off-by: Javier Santiago <[email protected]>

* Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws

Signed-off-by: Eduardo Ponz <[email protected]>

* Refs #16360: Added comments and remove some unneeded code

Signed-off-by: Javier Santiago <[email protected]>

* Applied suggestions

Signed-off-by: Javier Santiago <[email protected]>

* Uncrustify

Signed-off-by: Javier Santiago <[email protected]>

* Fixed Windows warnings

Signed-off-by: Javier Santiago <[email protected]>

* Added NOMINMAX flag to test

Signed-off-by: Javier Santiago <[email protected]>

---------

Signed-off-by: Javier Santiago <[email protected]>
Signed-off-by: Eduardo Ponz <[email protected]>
Co-authored-by: Eduardo Ponz <[email protected]>
(cherry picked from commit 72d1ba1)
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test discovery-server mac windows

@JLBuenoLopez JLBuenoLopez added the ci-pending PR which CI is running label Apr 11, 2023
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test mac test windows

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test windows

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Apr 17, 2023
@MiguelCompany MiguelCompany merged commit 491c513 into 2.9.x Apr 21, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.9.x/pr-3293 branch April 21, 2023 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants