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

core: Fix a few memory leaks

This commit is contained in:
Colin Walters 2012-04-02 17:41:04 -04:00
parent ea4d2be39c
commit a0b7d94cb6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-core.c
View File

@ -1289,6 +1289,7 @@ ostree_read_pack_entry_raw (guchar *pack_data,
ret_entry = g_variant_new_from_data (OSTREE_PACK_FILE_CONTENT_VARIANT_FORMAT, ret_entry = g_variant_new_from_data (OSTREE_PACK_FILE_CONTENT_VARIANT_FORMAT,
pack_data+entry_start, entry_len, pack_data+entry_start, entry_len,
trusted, NULL, NULL); trusted, NULL, NULL);
g_variant_ref_sink (ret_entry);
ret = TRUE; ret = TRUE;
ot_transfer_out_value (out_entry, &ret_entry); ot_transfer_out_value (out_entry, &ret_entry);
out: out:
@ -1324,6 +1325,7 @@ ostree_read_pack_entry_as_stream (GVariant *pack_entry)
"base-stream", memory_input, "base-stream", memory_input,
"close-base-stream", TRUE, "close-base-stream", TRUE,
NULL); NULL);
g_object_unref (memory_input);
g_object_unref (decompressor); g_object_unref (decompressor);
} }
else else
@ -1355,8 +1357,6 @@ ostree_read_pack_entry_variant (GVariant *pack_entry,
trusted, &container_variant, cancellable, error)) trusted, &container_variant, cancellable, error))
goto out; goto out;
g_variant_ref_sink (container_variant);
g_variant_get (container_variant, "(uv)", g_variant_get (container_variant, "(uv)",
&actual_type, &ret_variant); &actual_type, &ret_variant);
actual_type = GUINT32_FROM_BE (actual_type); actual_type = GUINT32_FROM_BE (actual_type);

6
src/libostree/ostree-repo.c
View File

@ -3298,6 +3298,7 @@ ostree_repo_load_file (OstreeRepo *self,
out: out:
g_free (content_pack_checksum); g_free (content_pack_checksum);
g_clear_object (&ret_input); g_clear_object (&ret_input);
g_clear_object (&content_loose_path);
g_clear_object (&content_loose_info); g_clear_object (&content_loose_info);
g_clear_object (&ret_file_info); g_clear_object (&ret_file_info);
ot_clear_gvariant (&ret_xattrs); ot_clear_gvariant (&ret_xattrs);
@ -3371,9 +3372,8 @@ list_objects_in_index (OstreeRepo *self,
g_variant_builder_add (&pack_contents_builder, "s", pack_checksum); g_variant_builder_add (&pack_contents_builder, "s", pack_checksum);
objdata = g_variant_new ("(b@as)", is_loose, objdata = g_variant_new ("(b@as)", is_loose,
g_variant_builder_end (&pack_contents_builder)); g_variant_builder_end (&pack_contents_builder));
g_hash_table_replace (inout_objects, g_variant_ref_sink (objdata);
obj_key, g_hash_table_replace (inout_objects, obj_key, objdata);
g_variant_ref (objdata));
} }
ret = TRUE; ret = TRUE;