From 5e30c192e9f7219322887da7252c344d5be1ec05 Mon Sep 17 00:00:00 2001 From: Artiom Di Date: Thu, 14 Nov 2013 15:24:43 +0200 Subject: [PATCH] Fix memleak for Config and parent commit objects --- commit.go | 13 +++++++------ config.go | 6 ++++++ repository.go | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/commit.go b/commit.go index cacaa33..c633e2d 100644 --- a/commit.go +++ b/commit.go @@ -9,8 +9,8 @@ extern int _go_git_treewalk(git_tree *tree, git_treewalk_mode mode, void *ptr); import "C" import ( - "unsafe" "time" + "unsafe" ) // Commit @@ -48,12 +48,13 @@ func (c Commit) Committer() *Signature { } func (c *Commit) Parent(n uint) *Commit { - par := &Commit{} - ret := C.git_commit_parent(&par.ptr, c.ptr, C.uint(n)) + var cobj *C.git_object + ret := C.git_commit_parent(&cobj, c.ptr, C.uint(n)) if ret != 0 { return nil } - return par + + return allocObject(cobj).(*Commit) } func (c *Commit) ParentId(n uint) *Oid { @@ -85,10 +86,10 @@ func newSignatureFromC(sig *C.git_signature) *Signature { // the offset in mintes, which is what git wants func (v *Signature) Offset() int { _, offset := v.When.Zone() - return offset/60 + return offset / 60 } -func (sig *Signature) toC() (*C.git_signature) { +func (sig *Signature) toC() *C.git_signature { var out *C.git_signature name := C.CString(sig.Name) diff --git a/config.go b/config.go index dcad2a7..7235716 100644 --- a/config.go +++ b/config.go @@ -6,6 +6,7 @@ package git */ import "C" import ( + "runtime" "unsafe" ) @@ -66,3 +67,8 @@ func (c *Config) Set(name, value string) (err error) { return nil } + +func (c *Config) Free() { + runtime.SetFinalizer(c, nil) + C.git_config_free(c.ptr) +} diff --git a/repository.go b/repository.go index 3ba3e5e..5540a0c 100644 --- a/repository.go +++ b/repository.go @@ -58,6 +58,7 @@ func (v *Repository) Config() (*Config, error) { return nil, LastError() } + runtime.SetFinalizer(config, (*Config).Free) return config, nil }