implemented freeing memory in secretservice and made minor edits to osxkeychain

Signed-off-by: Avi Vaid <[email protected]>

Author: avaid96

osxkeychain/osxkeychain_darwin.go

@@ -10,11 +10,11 @@ package osxkeychain
 import "C"
 import (
 	"errors"
+	"github.com/docker/docker-credential-helpers/credentials"
 	"net/url"
 	"strconv"
 	"strings"
 	"unsafe"
-	"github.com/docker/docker-credential-helpers/credentials"
 )
 
 // errCredentialsNotFound is the specific error message returned by OS X
@@ -94,28 +94,28 @@ func (h Osxkeychain) Get(serverURL string) (string, string, error) {
 	return user, pass, nil
 }
 
-func (h Osxkeychain) List() ([]string, []string, error){
-	var pathsC** C.char
+func (h Osxkeychain) List() ([]string, []string, error) {
+	var pathsC **C.char
 	defer C.free(unsafe.Pointer(pathsC))
-	var acctsC** C.char
+	var acctsC **C.char
 	defer C.free(unsafe.Pointer(acctsC))
 	var listLenC C.uint
 	errMsg := C.keychain_list(&pathsC, &acctsC, &listLenC)
-	if errMsg!=nil {
+	if errMsg != nil {
 		defer C.free(unsafe.Pointer(errMsg))
 		goMsg := C.GoString(errMsg)
 		return nil, nil, errors.New(goMsg)
 	}
-	var listLen int;
+	var listLen int
 	listLen = int(listLenC)
 	pathTmp := (*[1 << 30]*C.char)(unsafe.Pointer(pathsC))[:listLen:listLen]
 	acctTmp := (*[1 << 30]*C.char)(unsafe.Pointer(acctsC))[:listLen:listLen]
 	//taking the array of c strings into go while ignoring all the stuff irrelevant to credentials-helper
 	paths := make([]string, listLen)
 	accts := make([]string, listLen)
 	at := 0
-	for i := 0; i < listLen ; i++ {
-		if C.GoString(pathTmp[i])=="0" {
+	for i := 0; i < listLen; i++ {
+		if C.GoString(pathTmp[i]) == "0" {
 			continue
 		}
 		paths[at] = C.GoString(pathTmp[i])
@@ -124,9 +124,8 @@ func (h Osxkeychain) List() ([]string, []string, error){
 	}
 	paths = paths[:at]
 	accts = accts[:at]
-	//still need to free all the memory we allocated in the c file
-	//do it here >>
 	C.freeListData(&pathsC, listLenC)
+	C.freeListData(&acctsC, listLenC)
 	return paths, accts, nil
 }
 
@@ -164,4 +163,3 @@ func freeServer(s *C.struct_Server) {
 	C.free(unsafe.Pointer(s.host))
 	C.free(unsafe.Pointer(s.path))
 }
-

secretservice/secretservice_linux.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <stdlib.h>
 #include "secretservice_linux.h"
 
 const SecretSchema *docker_get_schema(void)
@@ -137,3 +138,10 @@ GError *list(char *** paths, char *** accts, unsigned int *list_l) {
 	*list_l = numKeys;
 	return NULL;
 }
+
+void freeListData(char *** data, unsigned int length) {
+	for(int i=0; i<length; i++) {
+		free((*data)[i]);
+	}
+	free(*data);
+}

secretservice/secretservice_linux.go

@@ -99,5 +99,7 @@ func (h Secretservice) List() ([]string, []string, error) {
 		paths[i] = C.GoString(pathTmp[i])
 		accts[i] = C.GoString(acctTmp[i])
 	}
+	C.freeListData(&pathsC, listLenC)
+	C.freeListData(&acctsC, listLenC)
 	return paths, accts, nil
 }

secretservice/secretservice_linux.h

@@ -10,3 +10,4 @@ GError *add(char *server, char *username, char *secret);
 GError *delete(char *server);
 GError *get(char *server, char **username, char **secret);
 GError *list(char *** paths, char *** accts, unsigned int *list_l);
+void freeListData(char *** data, unsigned int length);