summaryrefslogtreecommitdiff
path: root/packbuilder.go
diff options
context:
space:
mode:
Diffstat (limited to 'packbuilder.go')
-rw-r--r--packbuilder.go15
1 files changed, 11 insertions, 4 deletions
diff --git a/packbuilder.go b/packbuilder.go
index 7c94926..4dc352c 100644
--- a/packbuilder.go
+++ b/packbuilder.go
@@ -110,8 +110,13 @@ type packbuilderCbData struct {
}
//export packbuilderForEachCb
-func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Pointer) int {
- data := (*packbuilderCbData)(payload)
+func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, handle unsafe.Pointer) int {
+ payload := pointerHandles.Get(handle)
+ data, ok := payload.(*packbuilderCbData)
+ if !ok {
+ panic("could not get packbuilder CB data")
+ }
+
slice := C.GoBytes(buf, C.int(size))
err := data.callback(slice)
@@ -128,13 +133,15 @@ func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Poin
func (pb *Packbuilder) ForEach(callback PackbuilderForeachCallback) error {
data := packbuilderCbData{
callback: callback,
- err: nil,
+ err: nil,
}
+ handle := pointerHandles.Track(&data)
+ defer pointerHandles.Untrack(handle)
runtime.LockOSThread()
defer runtime.UnlockOSThread()
- err := C._go_git_packbuilder_foreach(pb.ptr, unsafe.Pointer(&data))
+ err := C._go_git_packbuilder_foreach(pb.ptr, handle)
if err == C.GIT_EUSER {
return data.err
}