From 9bbec34885aff0287802134acbfdb5a20409fd9e Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Fri, 24 Apr 2015 09:40:49 +0200
Subject: index: use HandleList for C function callbacks.

---
 index.go | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'index.go')

diff --git a/index.go b/index.go
index 1a899f1..c344bf8 100644
--- a/index.go
+++ b/index.go
@@ -162,16 +162,17 @@ func (v *Index) AddAll(pathspecs []string, flags IndexAddOpts, callback IndexMat
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	var cb *IndexMatchedPathCallback
+	var handle unsafe.Pointer
 	if callback != nil {
-		cb = &callback
+		handle = pointerHandles.Track(callback)
+		defer pointerHandles.Untrack(handle)
 	}
 
 	ret := C._go_git_index_add_all(
 		v.ptr,
 		&cpathspecs,
 		C.uint(flags),
-		unsafe.Pointer(cb),
+		handle,
 	)
 	if ret < 0 {
 		return MakeGitError(ret)
@@ -188,15 +189,16 @@ func (v *Index) UpdateAll(pathspecs []string, callback IndexMatchedPathCallback)
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	var cb *IndexMatchedPathCallback
+	var handle unsafe.Pointer
 	if callback != nil {
-		cb = &callback
+		handle = pointerHandles.Track(callback)
+		defer pointerHandles.Untrack(handle)
 	}
 
 	ret := C._go_git_index_update_all(
 		v.ptr,
 		&cpathspecs,
-		unsafe.Pointer(cb),
+		handle,
 	)
 	if ret < 0 {
 		return MakeGitError(ret)
@@ -213,15 +215,16 @@ func (v *Index) RemoveAll(pathspecs []string, callback IndexMatchedPathCallback)
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	var cb *IndexMatchedPathCallback
+	var handle unsafe.Pointer
 	if callback != nil {
-		cb = &callback
+		handle = pointerHandles.Track(callback)
+		defer pointerHandles.Untrack(handle)
 	}
 
 	ret := C._go_git_index_remove_all(
 		v.ptr,
 		&cpathspecs,
-		unsafe.Pointer(cb),
+		handle,
 	)
 	if ret < 0 {
 		return MakeGitError(ret)
@@ -231,8 +234,13 @@ func (v *Index) RemoveAll(pathspecs []string, callback IndexMatchedPathCallback)
 
 //export indexMatchedPathCallback
 func indexMatchedPathCallback(cPath, cMatchedPathspec *C.char, payload unsafe.Pointer) int {
-	callback := (*IndexMatchedPathCallback)(payload)
-	return (*callback)(C.GoString(cPath), C.GoString(cMatchedPathspec))
+	if payload == nil {
+		return 0
+	} else if callback, ok := pointerHandles.Get(payload).(IndexMatchedPathCallback); ok {
+		return callback(C.GoString(cPath), C.GoString(cMatchedPathspec))
+	} else {
+		return -1
+	}
 }
 
 func (v *Index) RemoveByPath(path string) error {
-- 
cgit v1.2.3


From d95932c84a2b9c926490def345d71d45bb19f344 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Fri, 22 May 2015 08:58:21 +0200
Subject: handles: panic when we cannot retrieve handle data

---
 index.go     | 6 ++----
 submodule.go | 2 +-
 tree.go      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'index.go')

diff --git a/index.go b/index.go
index c344bf8..c1bfb74 100644
--- a/index.go
+++ b/index.go
@@ -234,12 +234,10 @@ func (v *Index) RemoveAll(pathspecs []string, callback IndexMatchedPathCallback)
 
 //export indexMatchedPathCallback
 func indexMatchedPathCallback(cPath, cMatchedPathspec *C.char, payload unsafe.Pointer) int {
-	if payload == nil {
-		return 0
-	} else if callback, ok := pointerHandles.Get(payload).(IndexMatchedPathCallback); ok {
+	if callback, ok := pointerHandles.Get(payload).(IndexMatchedPathCallback); ok {
 		return callback(C.GoString(cPath), C.GoString(cMatchedPathspec))
 	} else {
-		return -1
+		panic("invalid matched path callback")
 	}
 }
 
diff --git a/submodule.go b/submodule.go
index 0588ec5..3882462 100644
--- a/submodule.go
+++ b/submodule.go
@@ -103,7 +103,7 @@ func SubmoduleVisitor(csub unsafe.Pointer, name *C.char, handle unsafe.Pointer)
 	if callback, ok := pointerHandles.Get(handle).(SubmoduleCbk); ok {
 		return (C.int)(callback(sub, C.GoString(name)))
 	} else {
-		return -1
+		panic("invalid submodule visitor callback")
 	}
 }
 
diff --git a/tree.go b/tree.go
index 70a3a3f..cbba08b 100644
--- a/tree.go
+++ b/tree.go
@@ -97,7 +97,7 @@ func CallbackGitTreeWalk(_root unsafe.Pointer, _entry unsafe.Pointer, ptr unsafe
 	if callback, ok := pointerHandles.Get(ptr).(TreeWalkCallback); ok {
 		return C.int(callback(root, newTreeEntry(entry)))
 	} else {
-		return C.int(-1)
+		panic("invalid treewalk callback")
 	}
 }
 
-- 
cgit v1.2.3