handles, merge, odb: changes for Go 1.6 pointer passing rules

See http://tip.golang.org/cmd/cgo/#hdr-Passing_pointers .

1 files changed, 3 insertions, 2 deletions

diff --git a/odb.go b/odb.go
index b15851f..8e8fba0 100644
--- a/odb.go
+++ b/odb.go
@@ -61,12 +61,13 @@ func (v *Odb) Exists(oid *Oid) bool {
 
 func (v *Odb) Write(data []byte, otype ObjectType) (oid *Oid, err error) {
 	oid = new(Oid)
-	hdr := (*reflect.SliceHeader)(unsafe.Pointer(&data))
+	cstr := C.CString(string(data))
+	defer C.free(unsafe.Pointer(cstr))
 
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(hdr.Data), C.size_t(hdr.Len), C.git_otype(otype))
+	ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(cstr), C.size_t(len(data)), C.git_otype(otype))
 
 	if ret < 0 {
 		return nil, MakeGitError(ret)