Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
fac42ff9
Commit
fac42ff9
authored
Feb 08, 2016
by
Patrick Steinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge: fix memory leak
parent
0f814deb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
src/merge.c
+2
-3
No files found.
src/merge.c
View file @
fac42ff9
...
...
@@ -1985,9 +1985,6 @@ static int create_virtual_base(
git_index
*
index
=
NULL
;
git_merge_options
virtual_opts
=
GIT_MERGE_OPTIONS_INIT
;
result
=
git__calloc
(
1
,
sizeof
(
git_annotated_commit
));
GITERR_CHECK_ALLOC
(
result
);
/* Conflicts in the merge base creation do not propagate to conflicts
* in the result; the conflicted base will act as the common ancestor.
*/
...
...
@@ -2001,6 +1998,8 @@ static int create_virtual_base(
recursion_level
+
1
,
&
virtual_opts
))
<
0
)
return
-
1
;
result
=
git__calloc
(
1
,
sizeof
(
git_annotated_commit
));
GITERR_CHECK_ALLOC
(
result
);
result
->
type
=
GIT_ANNOTATED_COMMIT_VIRTUAL
;
result
->
index
=
index
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment