1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Thu, 28 Feb 2019 08:25:49 +0700
Subject: C.free(unsafe.Pointer(err)) -> defer C.g_error_free(err)
Cherry-picked from upstream and reworked to apply to v0.6.1. Hopefully
upstream issue a release one day, but hey, that's docker...
Origin: upstream, https://github.com/docker/docker-credential-helpers/commit/73e5f5db
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
---
secretservice/secretservice_linux.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/secretservice/secretservice_linux.go b/secretservice/secretservice_linux.go
index 95a1310..383b0c2 100644
--- a/secretservice/secretservice_linux.go
+++ b/secretservice/secretservice_linux.go
@@ -93,7 +93,7 @@ func (h Secretservice) List() (map[string]string, error) {
var listLenC C.uint
err := C.list(credsLabelC, &pathsC, &acctsC, &listLenC)
if err != nil {
- defer C.free(unsafe.Pointer(err))
+ defer C.g_error_free(err)
return nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library")
}
defer C.freeListData(&pathsC, listLenC)
--
2.20.1
|