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

[8.14](backport #39822) packetbeat/route: fix test failure on Windows 2022 #39833

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2024

Proposed commit message

Windows 2022 appears to have added new text to the output of netsh. The text
is interpreted as having three fields. This impact on the behaviour of the
field splitting which expects five.

- Originally this would cause a panic due to bounds checking. This was fixed
  in #39757 by erroring on an unexpectedly short line.
- The fieldsN helper expects lines to be n fields or longer, but does not
  terminate on lines with fewer fields.

So treat the first blank line found in the table as the end of the table and
fix the fieldsN helper.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #39822 done by [Mergify](https://mergify.com).

Windows 2022 appears to have added new text to the output of netsh. The text
is interpreted as having three fields. This impact on the behaviour of the
field splitting which expects five.

- Originally this would cause a panic due to bounds checking. This was fixed
  in #39757 by erroring on an unexpectedly short line.
- The fieldsN helper expects lines to be n fields or longer, but does not
  terminate on lines with fewer fields.

So treat the first blank line found in the table as the end of the table and
fix the fieldsN helper.

(cherry picked from commit 35f8d09)
@mergify mergify bot requested a review from a team as a code owner June 7, 2024 20:46
@mergify mergify bot added the backport label Jun 7, 2024
@mergify mergify bot assigned efd6 Jun 7, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 7, 2024
@efd6 efd6 enabled auto-merge (squash) June 7, 2024 20:49
@efd6 efd6 added the Team:Security-Linux Platform Linux Platform Team in Security Solution label Jun 7, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 7, 2024
@efd6 efd6 merged commit e3a32b5 into 8.14 Jun 7, 2024
18 checks passed
@efd6 efd6 deleted the mergify/bp/8.14/pr-39822 branch June 7, 2024 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Security-Linux Platform Linux Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants