From 5b42d8e67b0e182733f5c68113fb4f7705f12680 Mon Sep 17 00:00:00 2001 From: Adrian Serrano Date: Wed, 8 May 2019 15:16:41 +0200 Subject: [PATCH 1/2] Update gosigar to v0.10.2 --- .../github.com/elastic/gosigar/CHANGELOG.md | 17 ++++++- .../gosigar/sys/windows/syscall_windows.go | 4 ++ vendor/vendor.json | 50 +++++++++---------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/vendor/github.com/elastic/gosigar/CHANGELOG.md b/vendor/github.com/elastic/gosigar/CHANGELOG.md index cfa804c9205..04051fed8e8 100644 --- a/vendor/github.com/elastic/gosigar/CHANGELOG.md +++ b/vendor/github.com/elastic/gosigar/CHANGELOG.md @@ -2,10 +2,25 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] + +### Added + +### Fixed + +### Changed + +### Deprecated + +## [0.10.2] + +### Fixed +- Fix memory leak when getting process arguments. #119 + ## [0.10.1] ### Fixed -- Replaced the WMI queries with win32 apis due to high CPU usage. #11840 +- Replaced the WMI queries with win32 apis due to high CPU usage. #116 ## [0.10.0] diff --git a/vendor/github.com/elastic/gosigar/sys/windows/syscall_windows.go b/vendor/github.com/elastic/gosigar/sys/windows/syscall_windows.go index 655836701f2..7da8a07135e 100644 --- a/vendor/github.com/elastic/gosigar/sys/windows/syscall_windows.go +++ b/vendor/github.com/elastic/gosigar/sys/windows/syscall_windows.go @@ -526,6 +526,10 @@ func ByteSliceToStringSlice(utf16 []byte) ([]string, error) { if err != nil { return nil, err } + + // Free memory allocated for CommandLineToArgvW arguments. + defer syscall.LocalFree((syscall.Handle)(unsafe.Pointer(argsWide))) + args := make([]string, numArgs) for idx := range args { args[idx] = syscall.UTF16ToString(argsWide[idx][:]) diff --git a/vendor/vendor.json b/vendor/vendor.json index e2b411c919b..aaf241c6dc0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1246,44 +1246,44 @@ "revisionTime": "2018-08-31T13:10:45Z" }, { - "checksumSHA1": "SyDYkg4fXTa27fsNrjnEQBKoDEQ=", + "checksumSHA1": "c1rU7WNZ+1AwZcRPBWhPBHcbZjg=", "path": "github.com/elastic/gosigar", - "revision": "fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736", - "revisionTime": "2019-04-24T11:51:21Z", - "version": "v0.10.1", - "versionExact": "v0.10.1" + "revision": "1227b9d6877d126ad640087e44439d70dba2df4f", + "revisionTime": "2019-05-08T13:07:01Z", + "version": "v0.10.2", + "versionExact": "v0.10.2" }, { - "checksumSHA1": "y4HBfgWAm5cwRN3Mn7S3Bn1/pDc=", + "checksumSHA1": "TX9y4oPL5YmT4Gb/OU4GIPTdQB4=", "path": "github.com/elastic/gosigar/cgroup", - "revision": "fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736", - "revisionTime": "2019-04-24T11:51:21Z", - "version": "v0.10.1", - "versionExact": "v0.10.1" + "revision": "1227b9d6877d126ad640087e44439d70dba2df4f", + "revisionTime": "2019-05-08T13:07:01Z", + "version": "v0.10.2", + "versionExact": "v0.10.2" }, { - "checksumSHA1": "axEkf+eo2z5V+R0nvgr1z+rty4w=", + "checksumSHA1": "hPqGM3DENaGfipEODoyZ4mKogTQ=", "path": "github.com/elastic/gosigar/sys", - "revision": "fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736", - "revisionTime": "2019-04-24T11:51:21Z", - "version": "v0.10.1", - "versionExact": "v0.10.1" + "revision": "1227b9d6877d126ad640087e44439d70dba2df4f", + "revisionTime": "2019-05-08T13:07:01Z", + "version": "v0.10.2", + "versionExact": "v0.10.2" }, { - "checksumSHA1": "BtggD07yUvVppRyX4HTrRi6sqnQ=", + "checksumSHA1": "mLq5lOyD0ZU39ysXuf1ETOLJ+f0=", "path": "github.com/elastic/gosigar/sys/linux", - "revision": "fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736", - "revisionTime": "2019-04-24T11:51:21Z", - "version": "v0.10.1", - "versionExact": "v0.10.1" + "revision": "1227b9d6877d126ad640087e44439d70dba2df4f", + "revisionTime": "2019-05-08T13:07:01Z", + "version": "v0.10.2", + "versionExact": "v0.10.2" }, { - "checksumSHA1": "CbP36vKSgkQruWF8PODFN9+SANI=", + "checksumSHA1": "R70u1XUHH/t1pquvHEFDeUFtkFk=", "path": "github.com/elastic/gosigar/sys/windows", - "revision": "fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736", - "revisionTime": "2019-04-24T11:51:21Z", - "version": "v0.10.1", - "versionExact": "v0.10.1" + "revision": "1227b9d6877d126ad640087e44439d70dba2df4f", + "revisionTime": "2019-05-08T13:07:01Z", + "version": "v0.10.2", + "versionExact": "v0.10.2" }, { "checksumSHA1": "Klc34HULvwvY4cGA/D8HmqtXLqw=", From 7ab065cafefba3a93f4d36d4243dea12c8a60f2b Mon Sep 17 00:00:00 2001 From: Adrian Serrano Date: Wed, 8 May 2019 16:10:32 +0200 Subject: [PATCH 2/2] Update NOTICE --- NOTICE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index de395baa9df..f0913fee97e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -765,8 +765,8 @@ Elasticsearch, B.V. (https://www.elastic.co/). -------------------------------------------------------------------- Dependency: github.com/elastic/gosigar -Version: v0.10.1 -Revision: fc57ef8c6efc0b4fdc6d7c623173073a6d3d4736 +Version: v0.10.2 +Revision: 1227b9d6877d126ad640087e44439d70dba2df4f License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/gosigar/LICENSE: --------------------------------------------------------------------