Commit Diff

Commit:
e476ee5e274eada26700de434b1500a7d8f71b97
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
release the memory used by the object cache Leak spotted by valgrind. ok stsp@
Actions:
Patch | Tree
commit - 99c6f580a3ccd12811e726f6773d468eb0952427
commit + e476ee5e274eada26700de434b1500a7d8f71b97
blob - da3b4fe102aa08dd63edc5a747cdbeebf44a6339
blob + 58b9ac8d9e308cf57456a2acd7381651a2d0ded2
--- lib/object_cache.c
+++ lib/object_cache.c
@@ -358,7 +358,36 @@ check_refcount(struct got_object_id *id, void *data, v
 	return NULL;
 }
 #endif
+
+static const struct got_error *
+free_entry(struct got_object_id *id, void *data, void *arg)
+{
+	struct got_object_cache *cache = arg;
+	struct got_object_cache_entry *ce = data;
+
+	switch (cache->type) {
+	case GOT_OBJECT_CACHE_TYPE_OBJ:
+		got_object_close(ce->data.obj);
+		break;
+	case GOT_OBJECT_CACHE_TYPE_TREE:
+		got_object_tree_close(ce->data.tree);
+		break;
+	case GOT_OBJECT_CACHE_TYPE_COMMIT:
+		got_object_commit_close(ce->data.commit);
+		break;
+	case GOT_OBJECT_CACHE_TYPE_TAG:
+		got_object_tag_close(ce->data.tag);
+		break;
+	case GOT_OBJECT_CACHE_TYPE_RAW:
+		got_object_raw_close(ce->data.raw);
+		break;
+	}
 
+	free(ce);
+
+	return NULL;
+}
+
 void
 got_object_cache_close(struct got_object_cache *cache)
 {
@@ -386,6 +415,7 @@ got_object_cache_close(struct got_object_cache *cache)
 #endif
 
 	if (cache->idset) {
+		got_object_idset_for_each(cache->idset, free_entry, cache);
 		got_object_idset_free(cache->idset);
 		cache->idset = NULL;
 	}