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

Fix oss-fuzz 40243 [13161] #2339

Merged
merged 3 commits into from
Dec 3, 2021
Merged

Fix oss-fuzz 40243 [13161] #2339

merged 3 commits into from
Dec 3, 2021

Conversation

MiguelCompany
Copy link
Member

Fixed a null-dereference on XML parser when a type has no name attribute

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

@jsan-rt jsan-rt left a comment

Choose a reason for hiding this comment

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

Small nitpick

src/cpp/rtps/xmlparser/XMLDynamicParser.cpp Outdated Show resolved Hide resolved
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Copy link
Contributor

@jsan-rt jsan-rt 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 fc4fade into master Dec 3, 2021
@MiguelCompany MiguelCompany deleted the hotfix/12736 branch December 3, 2021 22:55
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 2.4.x 2.3.x

mergify bot pushed a commit that referenced this pull request Dec 4, 2021
* Refs 12736. Added regression test.

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

* Refs 12736. Fixed issue.

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

* Refs 13161. Apply suggestion.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit fc4fade)
mergify bot pushed a commit that referenced this pull request Dec 4, 2021
* Refs 12736. Added regression test.

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

* Refs 12736. Fixed issue.

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

* Refs 13161. Apply suggestion.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit fc4fade)
@mergify
Copy link
Contributor

mergify bot commented Dec 4, 2021

backport 2.4.x 2.3.x

✅ Backports have been created

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.

2 participants