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

Fixed the SHM segment smashing while reading with security <2.1.x> #1645

Merged
merged 7 commits into from
Dec 23, 2020

Conversation

rsanchez15
Copy link
Contributor

This is a port of PR #1644 from 2.0.x to 2.1.x

@richiware
Copy link
Member

Build status:

  • Linux Build Status
  • Linux aarch64Build Status
  • Mac Build Status
  • Windows Build Status

Signed-off-by: RaulSanchez <raul@eprosima.com>
Signed-off-by: RaulSanchez <raul@eprosima.com>
Signed-off-by: RaulSanchez <raul@eprosima.com>
Signed-off-by: RaulSanchez <raul@eprosima.com>
Signed-off-by: RaulSanchez <raul@eprosima.com>
Signed-off-by: RaulSanchez <raul@eprosima.com>
@richiware
Copy link
Member

Build status:

  • Linux Build Status
  • Linux aarch64Build Status
  • Mac Build Status
  • Windows Build Status

Comment on lines 56 to 57
, crypto_payload_(participant->is_secure() ? rec_buffer_size : 0)
, crypto_submsg_(participant->is_secure() ? rec_buffer_size : 0)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
, crypto_payload_(participant->is_secure() ? rec_buffer_size : 0)
, crypto_submsg_(participant->is_secure() ? rec_buffer_size : 0)
, crypto_submsg_(participant->is_secure() ? rec_buffer_size : 0)
, crypto_payload_(participant->is_secure() ? rec_buffer_size : 0)

Comment on lines 96 to 97
CDRMessage_t crypto_submsg_;
SerializedPayload_t crypto_payload_;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
CDRMessage_t crypto_submsg_;
SerializedPayload_t crypto_payload_;
CDRMessage_t crypto_submsg_;
//!Buffer to process a decoded payload
SerializedPayload_t crypto_payload_;

Signed-off-by: RaulSanchez <raul@eprosima.com>
@richiware
Copy link
Member

Build status:

  • Linux Build Status
  • Linux aarch64Build Status
  • Mac Build Status
  • Windows Build Status

@richiware
Copy link
Member

Build status:

  • Linux Build Status
  • Linux aarch64Build Status
  • Mac Build Status
  • Windows Build Status

@EduPonz
Copy link

EduPonz commented Dec 23, 2020

@MiguelCompany what do you think?

@MiguelCompany
Copy link
Member

what do you think?

I think we can merge this one

@EduPonz EduPonz merged commit 36045fe into 2.1.x Dec 23, 2020
@EduPonz EduPonz deleted the bugfix/security-shm/2.1.x branch December 23, 2020 15:01
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.

4 participants