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

[19851] Fix missing mandatory attribute check in XML parser struct type (backport #3995) #4006

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2023

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

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

You are currently cherry-picking commit b10bfe651.
  (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/19851_profile_bin.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

* Refs #19851: Fix missing mandatory attribute check

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19851: Apply rev suggestions

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit b10bfe6)

# Conflicts:
#	test/unittest/xmlparser/XMLParserTests.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 13, 2023
@JesusPoderoso JesusPoderoso added this to the v2.11.3 milestone Nov 13, 2023
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.11.x/pr-3995 branch November 13, 2023 15:07
@MiguelCompany MiguelCompany restored the mergify/bp/2.11.x/pr-3995 branch November 13, 2023 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant