proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 18:13:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dereference of freed delta

Browse Source 
I was accidentally using a value that I had just freed.  This
moves the clearing of the delta internal flags into a better place.
This commit is contained in:
Russell Belfer 2013-05-23 11:52:34 -07:00
parent a21cbb12db
commit c68b09dc7a
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/diff_tform.c
View File

@ -18,6 +18,7 @@ static git_diff_delta *diff_delta__dup(
return NULL; return NULL;
memcpy(delta, d, sizeof(git_diff_delta)); memcpy(delta, d, sizeof(git_diff_delta));
GIT_DIFF_FLAG__CLEAR_INTERNAL(delta->flags);
if (d->old_file.path != NULL) { if (d->old_file.path != NULL) {
delta->old_file.path = git_pool_strdup(pool, d->old_file.path); delta->old_file.path = git_pool_strdup(pool, d->old_file.path);
@ -361,21 +362,25 @@ static int apply_splits_and_deletes(
delta->old_file.flags |= GIT_DIFF_FLAG_VALID_OID; delta->old_file.flags |= GIT_DIFF_FLAG_VALID_OID;
} }
if (git_vector_insert(&onto, delta) < 0) /* clean up delta before inserting into new list */
goto on_error;
}
/* cannot return an error past this point */
git_vector_foreach(&diff->deltas, i, delta) {
if ((delta->flags & GIT_DIFF_FLAG__TO_DELETE) != 0)
git__free(delta);
GIT_DIFF_FLAG__CLEAR_INTERNAL(delta->flags); GIT_DIFF_FLAG__CLEAR_INTERNAL(delta->flags);
if (delta->status != GIT_DELTA_COPIED && if (delta->status != GIT_DELTA_COPIED &&
delta->status != GIT_DELTA_RENAMED && delta->status != GIT_DELTA_RENAMED &&
(delta->status != GIT_DELTA_MODIFIED || actually_split)) (delta->status != GIT_DELTA_MODIFIED || actually_split))
delta->similarity = 0; delta->similarity = 0;
/* insert into new list */
if (git_vector_insert(&onto, delta) < 0)
goto on_error;
}
/* cannot return an error past this point */
/* free deltas from old list that didn't make it to the new one */
git_vector_foreach(&diff->deltas, i, delta) {
if ((delta->flags & GIT_DIFF_FLAG__TO_DELETE) != 0)
git__free(delta);
} }
/* swap new delta list into place */ /* swap new delta list into place */