First round of mass keep-alive additions

carlosmn · carlosmn · commit 58334cf60441 · 2017-07-08T09:11:38.000+02:00
diff --git a/blame.go b/blame.go
@@ -76,6 +76,7 @@ func (v *Repository) BlameFile(path string, opts *BlameOptions) (*Blame, error)
 	defer runtime.UnlockOSThread()
 
 	ecode := C.git_blame_file(&blamePtr, v.ptr, cpath, copts)
+	runtime.KeepAlive(v)
 	if ecode < 0 {
 		return nil, MakeGitError(ecode)
 	}
@@ -88,11 +89,15 @@ type Blame struct {
 }
 
 func (blame *Blame) HunkCount() int {
-	return int(C.git_blame_get_hunk_count(blame.ptr))
+	ret := int(C.git_blame_get_hunk_count(blame.ptr))
+	runtime.KeepAlive(blame)
+
+	return ret
 }
 
 func (blame *Blame) HunkByIndex(index int) (BlameHunk, error) {
 	ptr := C.git_blame_get_hunk_byindex(blame.ptr, C.uint32_t(index))
+	runtime.KeepAlive(blame)
 	if ptr == nil {
 		return BlameHunk{}, ErrInvalid
 	}
@@ -101,6 +106,7 @@ func (blame *Blame) HunkByIndex(index int) (BlameHunk, error) {
 
 func (blame *Blame) HunkByLine(lineno int) (BlameHunk, error) {
 	ptr := C.git_blame_get_hunk_byline(blame.ptr, C.size_t(lineno))
+	runtime.KeepAlive(blame)
 	if ptr == nil {
 		return BlameHunk{}, ErrInvalid
 	}
diff --git a/blob.go b/blob.go
@@ -21,13 +21,19 @@ type Blob struct {
 }
 
 func (v *Blob) Size() int64 {
-	return int64(C.git_blob_rawsize(v.cast_ptr))
+	ret := int64(C.git_blob_rawsize(v.cast_ptr))
+	runtime.KeepAlive(v)
+	return ret
 }
 
 func (v *Blob) Contents() []byte {
 	size := C.int(C.git_blob_rawsize(v.cast_ptr))
 	buffer := unsafe.Pointer(C.git_blob_rawcontent(v.cast_ptr))
-	return C.GoBytes(buffer, size)
+
+	goBytes := C.GoBytes(buffer, size)
+	runtime.KeepAlive(v)
+
+	return goBytes
 }
 
 func (repo *Repository) CreateBlobFromBuffer(data []byte) (*Oid, error) {
@@ -53,6 +59,7 @@ func (repo *Repository) CreateBlobFromBuffer(data []byte) (*Oid, error) {
 	}
 
 	ecode := C.git_blob_create_frombuffer(&id, repo.ptr, unsafe.Pointer(&data[0]), size)
+	runtime.KeepAlive(repo)
 	if ecode < 0 {
 		return nil, MakeGitError(ecode)
 	}
@@ -102,16 +109,18 @@ func (repo *Repository) CreateFromStream(hintPath string) (*BlobWriteStream, err
 		return nil, MakeGitError(ecode)
 	}
 
-	return newBlobWriteStreamFromC(stream), nil
+	return newBlobWriteStreamFromC(stream, repo), nil
 }
 
 type BlobWriteStream struct {
-	ptr *C.git_writestream
+	ptr  *C.git_writestream
+	repo *Repository
 }
 
-func newBlobWriteStreamFromC(ptr *C.git_writestream) *BlobWriteStream {
+func newBlobWriteStreamFromC(ptr *C.git_writestream, repo *Repository) *BlobWriteStream {
 	stream := &BlobWriteStream{
-		ptr: ptr,
+		ptr:  ptr,
+		repo: repo,
 	}
 
 	runtime.SetFinalizer(stream, (*BlobWriteStream).Free)
@@ -128,6 +137,7 @@ func (stream *BlobWriteStream) Write(p []byte) (int, error) {
 	defer runtime.UnlockOSThread()
 
 	ecode := C._go_git_writestream_write(stream.ptr, ptr, size)
+	runtime.KeepAlive(stream)
 	if ecode < 0 {
 		return 0, MakeGitError(ecode)
 	}
@@ -147,6 +157,7 @@ func (stream *BlobWriteStream) Commit() (*Oid, error) {
 	defer runtime.UnlockOSThread()
 
 	ecode := C.git_blob_create_fromstream_commit(&oid, stream.ptr)
+	runtime.KeepAlive(stream)
 	if ecode < 0 {
 		return nil, MakeGitError(ecode)
 	}
diff --git a/branch.go b/branch.go
@@ -88,6 +88,7 @@ func (repo *Repository) NewBranchIterator(flags BranchType) (*BranchIterator, er
 	defer runtime.UnlockOSThread()
 
 	ecode := C.git_branch_iterator_new(&ptr, repo.ptr, refType)
+	runtime.KeepAlive(repo)
 	if ecode < 0 {
 		return nil, MakeGitError(ecode)
 	}
@@ -106,6 +107,8 @@ func (repo *Repository) CreateBranch(branchName string, target *Commit, force bo
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_create(&ptr, repo.ptr, cBranchName, target.cast_ptr, cForce)
+	runtime.KeepAlive(repo)
+	runtime.KeepAlive(target)
 	if ret < 0 {
 		return nil, MakeGitError(ret)
 	}
@@ -117,6 +120,7 @@ func (b *Branch) Delete() error {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 	ret := C.git_branch_delete(b.Reference.ptr)
+	runtime.KeepAlive(b.Reference)
 	if ret < 0 {
 		return MakeGitError(ret)
 	}
@@ -133,6 +137,7 @@ func (b *Branch) Move(newBranchName string, force bool) (*Branch, error) {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_move(&ptr, b.Reference.ptr, cNewBranchName, cForce)
+	runtime.KeepAlive(b.Reference)
 	if ret < 0 {
 		return nil, MakeGitError(ret)
 	}
@@ -145,6 +150,7 @@ func (b *Branch) IsHead() (bool, error) {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_is_head(b.Reference.ptr)
+	runtime.KeepAlive(b.Reference)
 	switch ret {
 	case 1:
 		return true, nil
@@ -165,6 +171,7 @@ func (repo *Repository) LookupBranch(branchName string, bt BranchType) (*Branch,
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_lookup(&ptr, repo.ptr, cName, C.git_branch_t(bt))
+	runtime.KeepAlive(repo)
 	if ret < 0 {
 		return nil, MakeGitError(ret)
 	}
@@ -179,6 +186,7 @@ func (b *Branch) Name() (string, error) {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_name(&cName, b.Reference.ptr)
+	runtime.KeepAlive(b.Reference)
 	if ret < 0 {
 		return "", MakeGitError(ret)
 	}
@@ -196,6 +204,7 @@ func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_remote_name(&nameBuf, repo.ptr, cName)
+	runtime.KeepAlive(repo)
 	if ret < 0 {
 		return "", MakeGitError(ret)
 	}
@@ -212,6 +221,7 @@ func (b *Branch) SetUpstream(upstreamName string) error {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_set_upstream(b.Reference.ptr, cName)
+	runtime.KeepAlive(b.Reference)
 	if ret < 0 {
 		return MakeGitError(ret)
 	}
@@ -225,6 +235,7 @@ func (b *Branch) Upstream() (*Reference, error) {
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_upstream(&ptr, b.Reference.ptr)
+	runtime.KeepAlive(b.Reference)
 	if ret < 0 {
 		return nil, MakeGitError(ret)
 	}
@@ -241,6 +252,7 @@ func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error)
 	defer runtime.UnlockOSThread()
 
 	ret := C.git_branch_upstream_name(&nameBuf, repo.ptr, cName)
+	runtime.KeepAlive(repo)
 	if ret < 0 {
 		return "", MakeGitError(ret)
 	}
diff --git a/checkout.go b/checkout.go
@@ -188,6 +188,7 @@ func (v *Repository) CheckoutHead(opts *CheckoutOpts) error {
 	defer freeCheckoutOpts(cOpts)
 
 	ret := C.git_checkout_head(v.ptr, cOpts)
+	runtime.KeepAlive(v)
 	if ret < 0 {
 		return MakeGitError(ret)
 	}
@@ -211,6 +212,7 @@ func (v *Repository) CheckoutIndex(index *Index, opts *CheckoutOpts) error {
 	defer freeCheckoutOpts(cOpts)
 
 	ret := C.git_checkout_index(v.ptr, iptr, cOpts)
+	runtime.KeepAlive(v)
 	if ret < 0 {
 		return MakeGitError(ret)
 	}
@@ -226,6 +228,7 @@ func (v *Repository) CheckoutTree(tree *Tree, opts *CheckoutOpts) error {
 	defer freeCheckoutOpts(cOpts)
 
 	ret := C.git_checkout_tree(v.ptr, tree.ptr, cOpts)
+	runtime.KeepAlive(v)
 	if ret < 0 {
 		return MakeGitError(ret)
 	}
diff --git a/cherrypick.go b/cherrypick.go
@@ -66,6 +66,8 @@ func (v *Repository) Cherrypick(commit *Commit, opts CherrypickOptions) error {
 	defer freeCherrypickOpts(cOpts)
 
 	ecode := C.git_cherrypick(v.ptr, commit.cast_ptr, cOpts)
+	runtime.KeepAlive(v)
+	runtime.KeepAlive(commit)
 	if ecode < 0 {
 		return MakeGitError(ecode)
 	}
diff --git a/commit.go b/commit.go
@@ -77,7 +77,7 @@ func (c *Commit) Tree() (*Tree, error) {
 func (c *Commit) TreeId() *Oid {
 	ret := newOidFromC(C.git_commit_tree_id(c.cast_ptr))
 	runtime.KeepAlive(c)
-	return c
+	return ret
 }
 
 func (c *Commit) Author() *Signature {
@@ -101,15 +101,21 @@ func (c *Commit) Parent(n uint) *Commit {
 		return nil
 	}
 
-	return allocCommit(cobj, c.repo)
+	parent := allocCommit(cobj, c.repo)
+	runtime.KeepAlive(c)
+	return parent
 }
 
 func (c *Commit) ParentId(n uint) *Oid {
-	return newOidFromC(C.git_commit_parent_id(c.cast_ptr, C.uint(n)))
+	ret := newOidFromC(C.git_commit_parent_id(c.cast_ptr, C.uint(n)))
+	runtime.KeepAlive(c)
+	return ret
 }
 
 func (c *Commit) ParentCount() uint {
-	return uint(C.git_commit_parentcount(c.cast_ptr))
+	ret := uint(C.git_commit_parentcount(c.cast_ptr))
+	runtime.KeepAlive(c)
+	return ret
 }
 
 func (c *Commit) Amend(refname string, author, committer *Signature, message string, tree *Tree) (*Oid, error) {
@@ -142,6 +148,9 @@ func (c *Commit) Amend(refname string, author, committer *Signature, message str
 	oid := new(Oid)
 
 	cerr := C.git_commit_amend(oid.toC(), c.cast_ptr, cref, authorSig, committerSig, nil, cmsg, tree.cast_ptr)
+	runtime.KeepAlive(oid)
+	runtime.KeepAlive(c)
+	runtime.KeepAlive(tree)
 	if cerr < 0 {
 		return nil, MakeGitError(cerr)
 	}
diff --git a/config.go b/config.go
diff --git a/describe.go b/describe.go
diff --git a/repository.go b/repository.go

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ func (v Repository) BlameFile(path string, opts BlameOptions) (*Blame, error)`
`76`	`76`	`defer runtime.UnlockOSThread()`
`77`	`77`
`78`	`78`	`ecode := C.git_blame_file(&blamePtr, v.ptr, cpath, copts)`
	`79`	`+ runtime.KeepAlive(v)`
`79`	`80`	`if ecode < 0 {`
`80`	`81`	`return nil, MakeGitError(ecode)`
`81`	`82`	`}`
`@@ -88,11 +89,15 @@ type Blame struct {`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`func (blame *Blame) HunkCount() int {`
`91`		`- return int(C.git_blame_get_hunk_count(blame.ptr))`
	`92`	`+ ret := int(C.git_blame_get_hunk_count(blame.ptr))`
	`93`	`+ runtime.KeepAlive(blame)`
	`94`	`+`
	`95`	`+ return ret`
`92`	`96`	`}`
`93`	`97`
`94`	`98`	`func (blame *Blame) HunkByIndex(index int) (BlameHunk, error) {`
`95`	`99`	`ptr := C.git_blame_get_hunk_byindex(blame.ptr, C.uint32_t(index))`
	`100`	`+ runtime.KeepAlive(blame)`
`96`	`101`	`if ptr == nil {`
`97`	`102`	`return BlameHunk{}, ErrInvalid`
`98`	`103`	`}`
`@@ -101,6 +106,7 @@ func (blame *Blame) HunkByIndex(index int) (BlameHunk, error) {`
`101`	`106`
`102`	`107`	`func (blame *Blame) HunkByLine(lineno int) (BlameHunk, error) {`
`103`	`108`	`ptr := C.git_blame_get_hunk_byline(blame.ptr, C.size_t(lineno))`
	`109`	`+ runtime.KeepAlive(blame)`
`104`	`110`	`if ptr == nil {`
`105`	`111`	`return BlameHunk{}, ErrInvalid`
`106`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,19 @@ type Blob struct {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func (v *Blob) Size() int64 {`
`24`		`- return int64(C.git_blob_rawsize(v.cast_ptr))`
	`24`	`+ ret := int64(C.git_blob_rawsize(v.cast_ptr))`
	`25`	`+ runtime.KeepAlive(v)`
	`26`	`+ return ret`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`func (v *Blob) Contents() []byte {`
`28`	`30`	`size := C.int(C.git_blob_rawsize(v.cast_ptr))`
`29`	`31`	`buffer := unsafe.Pointer(C.git_blob_rawcontent(v.cast_ptr))`
`30`		`- return C.GoBytes(buffer, size)`
	`32`	`+`
	`33`	`+ goBytes := C.GoBytes(buffer, size)`
	`34`	`+ runtime.KeepAlive(v)`
	`35`	`+`
	`36`	`+ return goBytes`
`31`	`37`	`}`
`32`	`38`
`33`	`39`	`func (repo Repository) CreateBlobFromBuffer(data []byte) (Oid, error) {`
`@@ -53,6 +59,7 @@ func (repo Repository) CreateBlobFromBuffer(data []byte) (Oid, error) {`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`ecode := C.git_blob_create_frombuffer(&id, repo.ptr, unsafe.Pointer(&data[0]), size)`
	`62`	`+ runtime.KeepAlive(repo)`
`56`	`63`	`if ecode < 0 {`
`57`	`64`	`return nil, MakeGitError(ecode)`
`58`	`65`	`}`
`@@ -102,16 +109,18 @@ func (repo Repository) CreateFromStream(hintPath string) (BlobWriteStream, err`
`102`	`109`	`return nil, MakeGitError(ecode)`
`103`	`110`	`}`
`104`	`111`
`105`		`- return newBlobWriteStreamFromC(stream), nil`
	`112`	`+ return newBlobWriteStreamFromC(stream, repo), nil`
`106`	`113`	`}`
`107`	`114`
`108`	`115`	`type BlobWriteStream struct {`
`109`		`- ptr *C.git_writestream`
	`116`	`+ ptr *C.git_writestream`
	`117`	`+ repo *Repository`
`110`	`118`	`}`
`111`	`119`
`112`		`-func newBlobWriteStreamFromC(ptr C.git_writestream) BlobWriteStream {`
	`120`	`+func newBlobWriteStreamFromC(ptr C.git_writestream, repo Repository) *BlobWriteStream {`
`113`	`121`	`stream := &BlobWriteStream{`
`114`		`- ptr: ptr,`
	`122`	`+ ptr: ptr,`
	`123`	`+ repo: repo,`
`115`	`124`	`}`
`116`	`125`
`117`	`126`	`runtime.SetFinalizer(stream, (*BlobWriteStream).Free)`
`@@ -128,6 +137,7 @@ func (stream *BlobWriteStream) Write(p []byte) (int, error) {`
`128`	`137`	`defer runtime.UnlockOSThread()`
`129`	`138`
`130`	`139`	`ecode := C._go_git_writestream_write(stream.ptr, ptr, size)`
	`140`	`+ runtime.KeepAlive(stream)`
`131`	`141`	`if ecode < 0 {`
`132`	`142`	`return 0, MakeGitError(ecode)`
`133`	`143`	`}`
`@@ -147,6 +157,7 @@ func (stream BlobWriteStream) Commit() (Oid, error) {`
`147`	`157`	`defer runtime.UnlockOSThread()`
`148`	`158`
`149`	`159`	`ecode := C.git_blob_create_fromstream_commit(&oid, stream.ptr)`
	`160`	`+ runtime.KeepAlive(stream)`
`150`	`161`	`if ecode < 0 {`
`151`	`162`	`return nil, MakeGitError(ecode)`
`152`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ func (v Repository) CheckoutHead(opts CheckoutOpts) error {`
`188`	`188`	`defer freeCheckoutOpts(cOpts)`
`189`	`189`
`190`	`190`	`ret := C.git_checkout_head(v.ptr, cOpts)`
	`191`	`+ runtime.KeepAlive(v)`
`191`	`192`	`if ret < 0 {`
`192`	`193`	`return MakeGitError(ret)`
`193`	`194`	`}`
`@@ -211,6 +212,7 @@ func (v Repository) CheckoutIndex(index Index, opts *CheckoutOpts) error {`
`211`	`212`	`defer freeCheckoutOpts(cOpts)`
`212`	`213`
`213`	`214`	`ret := C.git_checkout_index(v.ptr, iptr, cOpts)`
	`215`	`+ runtime.KeepAlive(v)`
`214`	`216`	`if ret < 0 {`
`215`	`217`	`return MakeGitError(ret)`
`216`	`218`	`}`
`@@ -226,6 +228,7 @@ func (v Repository) CheckoutTree(tree Tree, opts *CheckoutOpts) error {`
`226`	`228`	`defer freeCheckoutOpts(cOpts)`
`227`	`229`
`228`	`230`	`ret := C.git_checkout_tree(v.ptr, tree.ptr, cOpts)`
	`231`	`+ runtime.KeepAlive(v)`
`229`	`232`	`if ret < 0 {`
`230`	`233`	`return MakeGitError(ret)`
`231`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ func (v Repository) Cherrypick(commit Commit, opts CherrypickOptions) error {`
`66`	`66`	`defer freeCherrypickOpts(cOpts)`
`67`	`67`
`68`	`68`	`ecode := C.git_cherrypick(v.ptr, commit.cast_ptr, cOpts)`
	`69`	`+ runtime.KeepAlive(v)`
	`70`	`+ runtime.KeepAlive(commit)`
`69`	`71`	`if ecode < 0 {`
`70`	`72`	`return MakeGitError(ecode)`
`71`	`73`	`}`