merge: fix memory leak related to merge file opts

2015-08-12 10:21:49 +02:00 · 2015-08-12 10:21:49 +02:00 · 37bb1a6025
parent cce14aa58b
commit 37bb1a6025
1 changed files with 1 additions and 0 deletions
--- 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()