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

[18395] Fix XMLParser null-derefence in parseLogConfig #3769

Merged
merged 2 commits into from
Aug 2, 2023
Merged

[18395] Fix XMLParser null-derefence in parseLogConfig #3769

merged 2 commits into from
Aug 2, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Aug 1, 2023 •
edited by MiguelCompany
Loading

Description

Fixes a nullptr access when attempting to get the text of no initialized use_default tag within a log tag in an XML configuration file, e.g.:

<log>
    </use_default/>
</log>

@Mergifyio backport 2.11.x 2.10.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
  • 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.

EduPonz added 2 commits August 1, 2023 10:17
@EduPonz
Refs #18395: Add regression test
67f0730 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #18395: Refactor XMLParser::parseLogConfig
6f3ceef 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz EduPonz added the ci-pending PR which CI is running label Aug 1, 2023
@EduPonz EduPonz added this to the v2.11.2 milestone Aug 1, 2023
@EduPonz EduPonz requested a review from MiguelCompany August 1, 2023 08:32
MiguelCompany
MiguelCompany approved these changes Aug 1, 2023
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany modified the milestones: v2.11.2, v2.12.0 Aug 1, 2023
@MiguelCompany MiguelCompany merged commit 4250cfa into master Aug 2, 2023
@MiguelCompany MiguelCompany deleted the bugfix/xmlparser_null_deref branch August 2, 2023 05:08
@MiguelCompany MiguelCompany 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 Aug 2, 2023
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Aug 2, 2023 •
edited
Loading

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Aug 2, 2023
@EduPonz @mergify
Fix XMLParser null-derefence in parseLogConfig (#3769)
52892d4 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)
@mergify mergify bot mentioned this pull request Aug 2, 2023
Merged
mergify bot pushed a commit that referenced this pull request Aug 2, 2023
@EduPonz @mergify
Fix XMLParser null-derefence in parseLogConfig (#3769)
b323872 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)
@mergify mergify bot mentioned this pull request Aug 2, 2023
Merged
@mergify mergify bot mentioned this pull request Aug 2, 2023
Merged
EduPonz added a commit that referenced this pull request Aug 2, 2023
@EduPonz
Fix XMLParser null-derefence in parseLogConfig (#3769)
c070f62 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)
EduPonz added a commit that referenced this pull request Aug 3, 2023
@mergify @EduPonz
Fix XMLParser null-derefence in parseLogConfig (#3769) (#3774)
0731042 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Aug 7, 2023
@mergify @EduPonz
Fix XMLParser null-derefence in parseLogConfig (#3769) (#3773)
aa4556d 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Aug 7, 2023
@mergify @EduPonz
Fix XMLParser null-derefence in parseLogConfig (#3769) (#3772)
f59303c 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4250cfa)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
jimwang118 pushed a commit to jimwang118/Fast-DDS that referenced this pull request Aug 22, 2023
@EduPonz @jimwang118
Fix XMLParser null-derefence in parseLogConfig (eProsima#3769)
4e6328e 
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

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.12.0
Development

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