Fix a memory leak in odb_otype_fast() This change frees a copy of a cached object in odb_otype_fast().
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
diff --git a/src/odb.c b/src/odb.c
index 6ab4bd9..6a7e7ca 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -1128,6 +1128,7 @@ static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id)
if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) {
*type_p = object->cached.type;
+ git_odb_object_free(object);
return 0;
}
diff --git a/tests/odb/mixed.c b/tests/odb/mixed.c
index ba2b2ac..87e945c 100644
--- a/tests/odb/mixed.c
+++ b/tests/odb/mixed.c
@@ -263,3 +263,24 @@ void test_odb_mixed__expand_ids(void)
git__free(ids);
}
+void test_odb_mixed__expand_ids_cached(void)
+{
+ git_odb_expand_id *ids;
+ size_t i, num;
+
+ /* test looking for the actual (correct) types after accessing the object */
+
+ setup_prefix_query(&ids, &num);
+
+ for (i = 0; i < num; i++) {
+ git_odb_object *obj;
+ if (ids[i].type == GIT_OBJECT_ANY)
+ continue;
+ cl_git_pass(git_odb_read_prefix(&obj, _odb, &ids[i].id, ids[i].length));
+ git_odb_object_free(obj);
+ }
+
+ cl_git_pass(git_odb_expand_ids(_odb, ids, num));
+ assert_found_objects(ids);
+ git__free(ids);
+}