merge: fix memory leak related to merge file opts

pks-t · pks-t · commit 37bb1a6025ea · 2015-08-12T10:24:59.000+02:00
diff --git a/merge.go b/merge.go
@@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp
 			return nil, MakeGitError(ecode)
 		}
 		populateCMergeFileOptions(copts, *options)
+		defer freeCMergeFileOptions(copts)
 	}
 
 	runtime.LockOSThread()

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp`
`394`	`394`	`return nil, MakeGitError(ecode)`
`395`	`395`	`}`
`396`	`396`	`populateCMergeFileOptions(copts, *options)`
	`397`	`+ defer freeCMergeFileOptions(copts)`
`397`	`398`	`}`
`398`	`399`
`399`	`400`	`runtime.LockOSThread()`