jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

handles: panic when we cannot retrieve handle data

This commit is contained in:
Patrick Steinhardt 2015-05-22 08:58:21 +02:00
parent a843b7247f
commit d95932c84a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.go
View File

@ -234,12 +234,10 @@ func (v *Index) RemoveAll(pathspecs []string, callback IndexMatchedPathCallback)
//export indexMatchedPathCallback //export indexMatchedPathCallback
func indexMatchedPathCallback(cPath, cMatchedPathspec *C.char, payload unsafe.Pointer) int { func indexMatchedPathCallback(cPath, cMatchedPathspec *C.char, payload unsafe.Pointer) int {
if payload == nil { if callback, ok := pointerHandles.Get(payload).(IndexMatchedPathCallback); ok {
return 0
} else if callback, ok := pointerHandles.Get(payload).(IndexMatchedPathCallback); ok {
return callback(C.GoString(cPath), C.GoString(cMatchedPathspec)) return callback(C.GoString(cPath), C.GoString(cMatchedPathspec))
} else { } else {
return -1 panic("invalid matched path callback")
} }
} }

2
submodule.go
View File

@ -103,7 +103,7 @@ func SubmoduleVisitor(csub unsafe.Pointer, name *C.char, handle unsafe.Pointer)
if callback, ok := pointerHandles.Get(handle).(SubmoduleCbk); ok { if callback, ok := pointerHandles.Get(handle).(SubmoduleCbk); ok {
return (C.int)(callback(sub, C.GoString(name))) return (C.int)(callback(sub, C.GoString(name)))
} else { } else {
return -1 panic("invalid submodule visitor callback")
} }
} }

2
tree.go
View File

@ -97,7 +97,7 @@ func CallbackGitTreeWalk(_root unsafe.Pointer, _entry unsafe.Pointer, ptr unsafe
if callback, ok := pointerHandles.Get(ptr).(TreeWalkCallback); ok { if callback, ok := pointerHandles.Get(ptr).(TreeWalkCallback); ok {
return C.int(callback(root, newTreeEntry(entry))) return C.int(callback(root, newTreeEntry(entry)))
} else { } else {
return C.int(-1) panic("invalid treewalk callback")
} }
} }