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 import of report results / errors without host (backport #1687) #1690

Merged
merged 3 commits into from
Sep 20, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2021

This is an automatic backport of pull request #1687 done by Mergify.
Cherry-pick of 584b552 has failed:

On branch mergify/bp/gvmd-21.04/pr-1687
Your branch is ahead of 'origin/gvmd-21.04' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 584b55255.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

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.io/

The gmp_xml_handle_result function will now no longer try to
remove newlines from the host if it is NULL.

When importing reports, errors may not have any host assigned,
which caused a segmentation fault without the added check
(AP-1641).

(cherry picked from commit c84140e)
(cherry picked from commit 584b552)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner September 20, 2021 08:25
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Sep 20, 2021
@jhelmold jhelmold added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Sep 20, 2021
@jhelmold jhelmold merged commit b28586b into gvmd-21.04 Sep 20, 2021
@jhelmold jhelmold deleted the mergify/bp/gvmd-21.04/pr-1687 branch September 20, 2021 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants