jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

merge: fix memory leak related to merge file opts

This commit is contained in:
Patrick Steinhardt 2015-08-12 10:21:49 +02:00
parent cce14aa58b
commit 37bb1a6025
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
merge.go
View File

@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp
return nil, MakeGitError(ecode) return nil, MakeGitError(ecode)
} }
populateCMergeFileOptions(copts, *options) populateCMergeFileOptions(copts, *options)
defer freeCMergeFileOptions(copts)
} }
runtime.LockOSThread() runtime.LockOSThread()