proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 20:17:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3842 from pks-t/pks/double-free

Browse Source 
blame: increment reference count for origin's commit
This commit is contained in:
Edward Thomson 2016-06-29 09:35:56 -04:00 committed by GitHub
commit d88e500133
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/blame_git.c
View File

@ -37,25 +37,27 @@ static void origin_decref(git_blame__origin *o)
static int make_origin(git_blame__origin **out, git_commit *commit, const char *path) static int make_origin(git_blame__origin **out, git_commit *commit, const char *path)
{ {
git_blame__origin *o; git_blame__origin *o;
git_object *blob;
size_t path_len = strlen(path), alloc_len; size_t path_len = strlen(path), alloc_len;
int error = 0; int error = 0;
if ((error = git_object_lookup_bypath(&blob, (git_object*)commit,
path, GIT_OBJ_BLOB)) < 0)
return error;
GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*o), path_len); GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*o), path_len);
GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1); GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
o = git__calloc(1, alloc_len); o = git__calloc(1, alloc_len);
GITERR_CHECK_ALLOC(o); GITERR_CHECK_ALLOC(o);
o->commit = commit; o->commit = commit;
o->blob = (git_blob *) blob;
o->refcnt = 1; o->refcnt = 1;
strcpy(o->path, path); strcpy(o->path, path);
if (!(error = git_object_lookup_bypath((git_object**)&o->blob, (git_object*)commit, *out = o;
path, GIT_OBJ_BLOB))) {
*out = o; return 0;
} else {
origin_decref(o);
}
return error;
} }
/* Locate an existing origin or create a new one. */ /* Locate an existing origin or create a new one. */
@ -529,8 +531,16 @@ static int pass_blame(git_blame *blame, git_blame__origin *origin, uint32_t opt)
goto finish; goto finish;
porigin = find_origin(blame, p, origin); porigin = find_origin(blame, p, origin);
if (!porigin) if (!porigin) {
/*
* We only have to decrement the parent's
* reference count when no porigin has
* been created, as otherwise the commit
* is assigned to the created object.
*/
git_commit_free(p);
continue; continue;
}
if (porigin->blob && origin->blob && if (porigin->blob && origin->blob &&
!git_oid_cmp(git_blob_id(porigin->blob), git_blob_id(origin->blob))) { !git_oid_cmp(git_blob_id(porigin->blob), git_blob_id(origin->blob))) {
pass_whole_blame(blame, origin, porigin); pass_whole_blame(blame, origin, porigin);