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 42193 [13449] (backport #2397) #3031

Merged
merged 1 commit into from
Oct 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2022

This is an automatic backport of pull request #2397 done by Mergify.
Cherry-pick of 4874d11 has failed:

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

You are currently cherry-picking commit 4874d1157.
  (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/13418.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/xmlparser/CMakeLists.txt
	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 21, 2022
@mergify mergify bot mentioned this pull request Oct 21, 2022
* Refs 13418. Regression test.

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

* Refs 13418. Fix issue.

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

# Conflicts:
#	test/unittest/xmlparser/CMakeLists.txt
#	test/unittest/xmlparser/XMLParserTests.cpp
@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Oct 21, 2022
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 166d795 into 2.3.x Oct 21, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2397 branch October 21, 2022 19: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.

1 participant