Commit 881e3da012453941eb2b237d85ab5636eea21c76
2012-01-19T11:38:09
Merge pull request #538 from carlosmn/ref-noleak Don't leak when deleting or removing refs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/hashtable.c b/src/hashtable.c
index f836f16..89c44ba 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -213,7 +213,7 @@ void *git_hashtable_lookup(git_hashtable *self, const void *key)
return NULL;
}
-int git_hashtable_remove(git_hashtable *self, const void *key)
+int git_hashtable_remove2(git_hashtable *self, const void *key, void **old_value)
{
int hash_id;
git_hashtable_node *node;
@@ -223,6 +223,7 @@ int git_hashtable_remove(git_hashtable *self, const void *key)
for (hash_id = 0; hash_id < GIT_HASHTABLE_HASHES; ++hash_id) {
node = node_with_hash(self, key, hash_id);
if (node->key && self->key_equal(key, node->key) == 0) {
+ *old_value = node->value;
node->key = NULL;
node->value = NULL;
self->key_count--;
diff --git a/src/hashtable.h b/src/hashtable.h
index 485b17a..cd458eb 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -42,7 +42,15 @@ git_hashtable *git_hashtable_alloc(size_t min_size,
git_hash_ptr hash,
git_hash_keyeq_ptr key_eq);
void *git_hashtable_lookup(git_hashtable *h, const void *key);
-int git_hashtable_remove(git_hashtable *table, const void *key);
+int git_hashtable_remove2(git_hashtable *table, const void *key, void **old_value);
+
+GIT_INLINE(int) git_hashtable_remove(git_hashtable *table, const void *key)
+{
+ void *_unused;
+ return git_hashtable_remove2(table, key, &_unused);
+}
+
+
void git_hashtable_free(git_hashtable *h);
void git_hashtable_clear(git_hashtable *h);
int git_hashtable_merge(git_hashtable *self, git_hashtable *other);
diff --git a/src/refs.c b/src/refs.c
index 340841c..86e5f5d 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -984,14 +984,16 @@ static int reference_delete(git_reference *ref)
* We need to reload the packfile, remove the reference from the
* packing list, and repack */
if (ref->flags & GIT_REF_PACKED) {
+ struct packref *packref;
/* load the existing packfile */
if ((error = packed_load(ref->owner)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to delete reference");
- if (git_hashtable_remove(ref->owner->references.packfile,
- ref->name) < GIT_SUCCESS)
+ if (git_hashtable_remove2(ref->owner->references.packfile,
+ ref->name, (void **) &packref) < GIT_SUCCESS)
return git__throw(GIT_ENOTFOUND, "Reference not found");
+ git__free (packref);
error = packed_write(ref->owner);
/* If the reference is loose, we can just remove the reference