Merge branch 'master' into custom_odb

1 files changed, 8 insertions, 0 deletions

diff --git a/odb.go b/odb.go
index 1e81d58..c7c8bd9 100644
--- a/odb.go
+++ b/odb.go
@@ -55,6 +55,10 @@ 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))
+
+	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))
 
 	if ret < 0 {
@@ -66,6 +70,10 @@ func (v *Odb) Write(data []byte, otype ObjectType) (oid *Oid, err error) {
 
 func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) {
 	obj = new(OdbObject)
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_odb_read(&obj.ptr, v.ptr, oid.toC())
 	if ret < 0 {
 		return nil, LastError()