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.

Sign up for GitHub

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

Jump to bottom

[22608] Fix null-dereference in parseXMLMemberDynamicType #5565

Merged
merged 2 commits into from
Jan 20, 2025
Merged

[22608] Fix null-dereference in parseXMLMemberDynamicType #5565

merged 2 commits into from
Jan 20, 2025
+9 −0

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Jan 10, 2025 •
edited
Loading

Description

This fixes a null dereference in the XML parser for dynamic types found by OSS Fuzz.

@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.
  • 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.

@MiguelCompany
Refs #22535. Add regression test.
e0d0ce0 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
Refs #22535. Fix issue.
ce5cc51 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v3.2.0 milestone Jan 10, 2025
@Javgilavi Javgilavi self-requested a review January 17, 2025 09:21
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 17, 2025
Javgilavi
Javgilavi approved these changes Jan 17, 2025
View reviewed changes
Copy link
Contributor

@Javgilavi Javgilavi 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 c0e7929 into master Jan 20, 2025
15 of 17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/22535 branch January 20, 2025 07:05
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 20, 2025 •
edited
Loading

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jan 20, 2025
@MiguelCompany @mergify
Fix null-dereference in parseXMLMemberDynamicType (#5565)
cf22f29 
* Refs #22535. Add regression test.

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

* Refs #22535. Fix issue.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit c0e7929)
@mergify mergify bot mentioned this pull request Jan 20, 2025
Open
12 tasks
mergify bot pushed a commit that referenced this pull request Jan 20, 2025
@MiguelCompany @mergify
Fix null-dereference in parseXMLMemberDynamicType (#5565)
1d016eb 
* Refs #22535. Add regression test.

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

* Refs #22535. Fix issue.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit c0e7929)
@mergify mergify bot mentioned this pull request Jan 20, 2025
Open
12 tasks
mergify bot pushed a commit that referenced this pull request Jan 20, 2025
@MiguelCompany @mergify
Fix null-dereference in parseXMLMemberDynamicType (#5565)
55e746d 
* Refs #22535. Add regression test.

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

* Refs #22535. Fix issue.

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

---------

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

# Conflicts:
#	src/cpp/xmlparser/XMLDynamicParser.cpp
#	test/unittest/xmlparser/XMLParserTests.cpp
@mergify mergify bot mentioned this pull request Jan 20, 2025
Open
12 tasks
mergify bot pushed a commit that referenced this pull request Jan 20, 2025
@MiguelCompany @mergify
Fix null-dereference in parseXMLMemberDynamicType (#5565)
e48349d 
* Refs #22535. Add regression test.

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

* Refs #22535. Fix issue.

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

---------

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

# Conflicts:
#	src/cpp/xmlparser/XMLDynamicParser.cpp
#	test/unittest/xmlparser/XMLParserTests.cpp
@mergify mergify bot mentioned this pull request Jan 20, 2025
Open
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Javgilavi Javgilavi Javgilavi approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @Javgilavi