packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Fix some minor memory leaks 

I initially was going to add a `G_DEFINE_AUTOPTR_CLEANUP_FUNC` for
`FetchStaticDeltaData`, but it honestly didn't seem worth mucking around
ownership everywhere and potentially getting it wrong.

Discovered by Coverity.

Closes: #1692
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-07-25 17:49:12 -04:00 committed by Atomic Bot
parent 9482922e5e
commit fcd31a195b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libostree/ostree-repo-pull.c
View File

@ -2486,7 +2486,10 @@ process_one_static_delta (OtPullData *pull_data,
OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM, OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM,
NULL, &inline_delta_part, NULL, &inline_delta_part,
cancellable, error)) cancellable, error))
return FALSE; {
fetch_static_delta_data_free (fetch_data);
return FALSE;
}
_ostree_static_delta_part_execute_async (pull_data->repo, _ostree_static_delta_part_execute_async (pull_data->repo,
fetch_data->objects, fetch_data->objects,

3
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -313,14 +313,13 @@ finish_part (OstreeStaticDeltaBuilder *builder, GError **error)
static OstreeStaticDeltaPartBuilder * static OstreeStaticDeltaPartBuilder *
allocate_part (OstreeStaticDeltaBuilder *builder, GError **error) allocate_part (OstreeStaticDeltaBuilder *builder, GError **error)
{ {
OstreeStaticDeltaPartBuilder *part = g_new0 (OstreeStaticDeltaPartBuilder, 1);
if (builder->parts->len > 0) if (builder->parts->len > 0)
{ {
if (!finish_part (builder, error)) if (!finish_part (builder, error))
return NULL; return NULL;
} }
OstreeStaticDeltaPartBuilder *part = g_new0 (OstreeStaticDeltaPartBuilder, 1);
part->objects = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref); part->objects = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref);
part->payload = g_string_new (NULL); part->payload = g_string_new (NULL);
part->operations = g_string_new (NULL); part->operations = g_string_new (NULL);