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

[7.17](backport #36650) winlogbeat/sys/wineventlog: fix unsafe pointer use #36662

Merged
merged 3 commits into from
Sep 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2023

This is an automatic backport of pull request #36650 done by Mergify.
Cherry-pick of 0ad4264 has failed:

On branch mergify/bp/7.17/pr-36650
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 0ad4264557.
  (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:   CHANGELOG-developer.next.asciidoc
	modified:   winlogbeat/sys/wineventlog/format_message.go
	modified:   winlogbeat/sys/wineventlog/renderer.go
	modified:   winlogbeat/sys/wineventlog/syscall_windows.go
	modified:   winlogbeat/sys/wineventlog/zsyscall_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   winlogbeat/sys/wineventlog/wineventlog_windows.go

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

Fix the use of pointer to uintptr conversions to comply with the unsafe.Pointer
rules. In particular, the code previously was not making conversions from a *T
to uintptr in the call expression as required by rule (4) Conversion of a
Pointer to a uintptr when calling syscall.Syscall[1].

[1]https://pkg.go.dev/unsafe#Pointer

(cherry picked from commit 0ad4264)

# Conflicts:
#	winlogbeat/sys/wineventlog/wineventlog_windows.go
@mergify mergify bot requested a review from a team as a code owner September 22, 2023 20:40
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 22, 2023
@mergify mergify bot assigned efd6 Sep 22, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 22, 2023
@botelastic
Copy link

botelastic bot commented Sep 22, 2023

This pull request doesn't have a Team:<team> label.

@efd6 efd6 enabled auto-merge (squash) September 22, 2023 21:11
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 22, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-09-22T21:11:25.003+0000

  • Duration: 79 min 16 sec

Test stats 🧪

Test Results
Failed 0
Passed 20611
Skipped 1418
Total 22029

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 merged commit 7e3fec6 into 7.17 Sep 22, 2023
5 of 8 checks passed
@efd6 efd6 deleted the mergify/bp/7.17/pr-36650 branch September 22, 2023 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants