Skip to content

[8.17](backport #44026) Fix EvtVarTypeAnsiString conversion in winlogbeat #45228

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.

Sign up for GitHub

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

Merged
marc-gr merged 2 commits into from
Jul 8, 2025
Merged

[8.17](backport #44026) Fix EvtVarTypeAnsiString conversion in winlogbeat #45228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f45950d
Fix EvtVarTypeAnsiString conversion in winlogbeat (#44026)
AltairQ Jul 8, 2025
6d93544
Update CHANGELOG.next.asciidoc
marc-gr Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

*Winlogbeat*

- Fix EvtVarTypeAnsiString conversion {pull}44026[44026]


*Elastic Logging Plugin*
Expand Down
5 changes: 4 additions & 1 deletion winlogbeat/sys/strings_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package sys

import (
"bytes"
"sync"

"golang.org/x/sys/windows"
Expand Down Expand Up @@ -48,6 +49,8 @@ func initANSIDecoder() *encoding.Decoder {
}

func ANSIBytesToString(enc []byte) (string, error) {
out, err := getCachedANSIDecoder().Bytes(enc)
// Trim to the null terminator
prefix, _, _ := bytes.Cut(enc, []byte("\x00"))
out, err := getCachedANSIDecoder().Bytes(prefix)
return string(out), err
}