Merge pull request #368 from cbguder/master

carlosmn · web-flow · commit 490e8a87222c · 2017-04-14T10:47:39.000+02:00
Fix memory leak in Patch.String()
diff --git a/patch.go b/patch.go
@@ -40,15 +40,18 @@ func (patch *Patch) String() (string, error) {
 	if patch.ptr == nil {
 		return "", ErrInvalid
 	}
-	var buf C.git_buf
 
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
+	var buf C.git_buf
+
 	ecode := C.git_patch_to_buf(&buf, patch.ptr)
 	if ecode < 0 {
 		return "", MakeGitError(ecode)
 	}
+	defer C.git_buf_free(&buf)
+
 	return C.GoString(buf.ptr), nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,18 @@ func (patch *Patch) String() (string, error) {`
`40`	`40`	`if patch.ptr == nil {`
`41`	`41`	`return "", ErrInvalid`
`42`	`42`	`}`
`43`		`- var buf C.git_buf`
`44`	`43`
`45`	`44`	`runtime.LockOSThread()`
`46`	`45`	`defer runtime.UnlockOSThread()`
`47`	`46`
	`47`	`+ var buf C.git_buf`
	`48`	`+`
`48`	`49`	`ecode := C.git_patch_to_buf(&buf, patch.ptr)`
`49`	`50`	`if ecode < 0 {`
`50`	`51`	`return "", MakeGitError(ecode)`
`51`	`52`	`}`
	`53`	`+ defer C.git_buf_free(&buf)`
	`54`	`+`
`52`	`55`	`return C.GoString(buf.ptr), nil`
`53`	`56`	`}`
`54`	`57`