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 not caught exception in XMLDynamicParser [13462] (backport #2403) #3033

Merged
merged 1 commit into from
Oct 24, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2022

This is an automatic backport of pull request #2403 done by Mergify.
Cherry-pick of c3678e2 has failed:

On branch mergify/bp/2.3.x/pr-2403
Your branch is up to date with 'origin/2.3.x'.

You are currently cherry-picking commit c3678e2a3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
	new file:   test/unittest/xmlparser/regressions/13454.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/xmlparser/XMLParserTests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 24, 2022
XMLDynamicParser uses stoi() without a try/catch statement. With a wrong XML attribute value a exception is launched without being caught.

This will fix oss-fuzz 43525

(cherry picked from commit c3678e2)

# Conflicts:
#	test/unittest/xmlparser/XMLParserTests.cpp
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.3.x/pr-2403 branch from e95308d to 2b5975a Compare October 24, 2022 06:03
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Oct 24, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Oct 24, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit b12edf8 into 2.3.x Oct 24, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2403 branch October 24, 2022 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants