proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 03:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attr_cache_remove: don't remove given file

Browse Source 
If `attr_cache_lookup_entry` fails to find the given file, make sure
that we do not try to free the given file.
This commit is contained in:
Edward Thomson 2017-01-23 23:00:00 +00:00
parent a0d3847983
commit 7f66a70eec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/attrcache.c
View File

@ -121,20 +121,22 @@ static int attr_cache_remove(git_attr_cache *cache, git_attr_file *file)
{ {
int error = 0; int error = 0;
git_attr_file_entry *entry; git_attr_file_entry *entry;
git_attr_file *old = NULL;
if (!file) if (!file)
return 0; return 0;
if ((error = attr_cache_lock(cache)) < 0) if ((error = attr_cache_lock(cache)) < 0)
return error; return error;
if ((entry = attr_cache_lookup_entry(cache, file->entry->path)) != NULL) if ((entry = attr_cache_lookup_entry(cache, file->entry->path)) != NULL)
file = git__compare_and_swap(&entry->file[file->source], file, NULL); old = git__compare_and_swap(&entry->file[file->source], file, NULL);
attr_cache_unlock(cache); attr_cache_unlock(cache);
if (file) { if (old) {
GIT_REFCOUNT_OWN(file, NULL); GIT_REFCOUNT_OWN(old, NULL);
git_attr_file__free(file); git_attr_file__free(old);
} }
return error; return error;