Skip to content

[18632] Capture all fastcdr exceptions#3528

Merged
MiguelCompany merged 6 commits intomasterfrom
bugfix/18001
May 26, 2023
Merged

[18632] Capture all fastcdr exceptions#3528
MiguelCompany merged 6 commits intomasterfrom
bugfix/18001

Conversation

@MiguelCompany
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany commented May 22, 2023 •
edited by JesusPoderoso
Loading

Description

This should fix #3422 by capturing all possible exceptions from Fast CDR in the places where Fast DDS is using it for (de)serialization.

@Mergifyio backport 2.10.x 2.9.x 2.6.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.
  • Changes are ABI compatible.
  • 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.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany
Refs #18001. Fixes on DDSFilterExpression.cpp
780ad1a 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Refs #18001. Fixes on TCPControlMessage.cpp
997c38e 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Refs #18001. Changes in DynamicPubSubType.
5a6039c 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Refs #18001. Changes in TypeLookupTypes.
f51c27a 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Refs #18001. Changes in AESGCMGMAC_Transform.
c32b287 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany changed the title Capture all fastcdr exceptions [18632] Capture all fastcdr exceptions May 22, 2023
@MiguelCompany
Refs #18001. Uncrustify.
2445f04 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@JesusPoderoso
Copy link
Copy Markdown
Contributor

JesusPoderoso commented May 26, 2023

@richiprosima please test this

@JesusPoderoso JesusPoderoso added this to the v2.11.0 milestone May 26, 2023
@JesusPoderoso JesusPoderoso self-requested a review May 26, 2023 09:15
@JesusPoderoso JesusPoderoso added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label May 26, 2023
JesusPoderoso
JesusPoderoso approved these changes May 26, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM

@MiguelCompany MiguelCompany merged commit f4000e8 into master May 26, 2023
@MiguelCompany MiguelCompany deleted the bugfix/18001 branch May 26, 2023 09:19
@MiguelCompany
Copy link
Copy Markdown
Member Author

MiguelCompany commented May 26, 2023

@Mergifyio backport 2.10.x 2.9.x 2.6.x

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 26, 2023 •
edited
Loading

backport 2.10.x 2.9.x 2.6.x

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request May 26, 2023
@MiguelCompany @mergify
Capture all fastcdr exceptions (#3528)
c6790c2 
* Refs #18001. Fixes on DDSFilterExpression.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Fixes on TCPControlMessage.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in DynamicPubSubType.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in TypeLookupTypes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in AESGCMGMAC_Transform.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit f4000e8)
@mergify mergify bot mentioned this pull request May 26, 2023
Merged
mergify bot pushed a commit that referenced this pull request May 26, 2023
@MiguelCompany @mergify
Capture all fastcdr exceptions (#3528)
aab4ebc 
* Refs #18001. Fixes on DDSFilterExpression.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Fixes on TCPControlMessage.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in DynamicPubSubType.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in TypeLookupTypes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in AESGCMGMAC_Transform.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit f4000e8)
mergify bot pushed a commit that referenced this pull request May 26, 2023
@MiguelCompany @mergify
Capture all fastcdr exceptions (#3528)
e413f14 
* Refs #18001. Fixes on DDSFilterExpression.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Fixes on TCPControlMessage.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in DynamicPubSubType.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in TypeLookupTypes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in AESGCMGMAC_Transform.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit f4000e8)

# Conflicts:
#	src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp
This was referenced May 26, 2023
Merged
Merged
JLBuenoLopez pushed a commit that referenced this pull request Jun 6, 2023
@mergify @MiguelCompany
Capture all fastcdr exceptions (backport #3528) (#3542)
3fd92fb 
* Capture all fastcdr exceptions (#3528)

* Refs #18001. Fixes on DDSFilterExpression.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Fixes on TCPControlMessage.cpp

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in DynamicPubSubType.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in TypeLookupTypes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Changes in AESGCMGMAC_Transform.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #18001. Uncrustify.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit f4000e8)

# Conflicts:
#	src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp

* Fix conflicts

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
@JLBuenoLopez JLBuenoLopez mentioned this pull request Oct 2, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@JesusPoderoso JesusPoderoso JesusPoderoso approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Milestone

v2.11.0

Development

Successfully merging this pull request may close these issues.

[18001] FastDDS crashes when encapsulation kind of serialized data is unknown

2 participants

@MiguelCompany @JesusPoderoso