core: Add valgrind framework, plug various memory leaks

This commit is contained in:
Colin Walters committed 2012-05-04 10:04:32 -04:00
1 parent 7ce587da30
commit 8d926c3e36
13 files changed
+252 -47

No files matched your search

+10 -8
View File
@@ -441,18 +441,18 @@ ostree_content_stream_parse (GInputStream *input,
if (ret_file_info)
g_file_info_set_size (ret_file_info, input_length - archive_header_size - 8);
if (g_file_info_get_file_type (ret_file_info) != G_FILE_TYPE_REGULAR)
if (g_file_info_get_file_type (ret_file_info) == G_FILE_TYPE_REGULAR
&& out_input)
{
g_clear_object (&ret_input);
/* Give the input stream at its current position as return value;
* assuming the caller doesn't seek, this should be fine. We might
* want to wrap it though in a non-seekable stream.
**/
ret_input = g_object_ref (input);
}
ret = TRUE;
/* Give the input stream at its current position as return value;
* assuming the caller doesn't seek, this should be fine. We might
* want to wrap it though in a non-seekable stream.
**/
g_object_ref (input);
ot_transfer_out_value (out_input, &input);
ot_transfer_out_value (out_input, &ret_input);
ot_transfer_out_value (out_file_info, &ret_file_info);
ot_transfer_out_value (out_xattrs, &ret_xattrs);
out:
@@ -1835,6 +1835,7 @@ ostree_validate_structureof_pack_superindex (GVariant *superindex,
goto out;
}
csum_v = NULL;
bloom = NULL;
g_variant_get_child (superindex, 3, "a(ayay)", &content_iter);
while (g_variant_iter_loop (content_iter, "(@ay@ay)",
@@ -1844,6 +1845,7 @@ ostree_validate_structureof_pack_superindex (GVariant *superindex,
goto out;
}
csum_v = NULL;
bloom = NULL;
ret = TRUE;
out:
+4 -3
View File
@@ -65,6 +65,7 @@ ostree_repo_file_finalize (GObject *object)
g_free (self->tree_contents_checksum);
g_free (self->tree_metadata_checksum);
g_free (self->commit);
g_clear_error (&self->commit_resolve_error);
g_free (self->name);
G_OBJECT_CLASS (ostree_repo_file_parent_class)->finalize (object);
@@ -400,6 +401,8 @@ ostree_repo_file_get_checksum (OstreeRepoFile *self)
self->cached_file_checksum = ostree_checksum_from_bytes_v (csum_bytes);
g_variant_unref (csum_bytes);
return self->cached_file_checksum;
}
@@ -721,7 +724,7 @@ bsearch_in_file_variant (GVariant *variant,
imin = 0;
while (imax >= imin)
{
GVariant *child;
ot_lvariant GVariant *child = NULL;
const char *cur;
int cmp;
@@ -741,11 +744,9 @@ bsearch_in_file_variant (GVariant *variant,
}
else
{
ot_clear_gvariant (&child);
*out_pos = imid;
return TRUE;
}
ot_clear_gvariant (&child);
}
*out_pos = imid;
+5 -9
View File
@@ -265,13 +265,12 @@ parse_rev_file (OstreeRepo *self,
if (g_str_has_prefix (rev, "ref: "))
{
GFile *ref;
ot_lobj GFile *ref = NULL;
char *ref_sha256;
gboolean subret;
ref = g_file_resolve_relative_path (priv->local_heads_dir, rev + 5);
subret = parse_rev_file (self, ref, &ref_sha256, error);
g_clear_object (&ref);
if (!subret)
{
@@ -3025,7 +3024,7 @@ list_loose_object_dir (OstreeRepo *self,
value = g_variant_new ("(b@as)",
TRUE, g_variant_new_strv (NULL, 0));
/* transfer ownership */
g_hash_table_replace (inout_objects, g_variant_ref_sink (key),
g_hash_table_replace (inout_objects, key,
g_variant_ref_sink (value));
}
loop_next:
@@ -3870,7 +3869,7 @@ checkout_one_file (OstreeRepo *self,
if (link_cache)
{
ot_lobj GFile *parent;
ot_lobj GFile *parent = NULL;
g_assert (possible_loose_path);
parent = g_file_get_parent (possible_loose_path);
@@ -3907,8 +3906,6 @@ ostree_repo_checkout_tree (OstreeRepo *self,
ot_lobj GFileInfo *file_info = NULL;
ot_lvariant GVariant *xattrs = NULL;
ot_lobj GFileEnumerator *dir_enum = NULL;
ot_lobj GFile *src_child = NULL;
ot_lobj GFile *dest_path = NULL;
if (!ostree_repo_file_get_xattrs (source, &xattrs, NULL, error))
goto out;
@@ -3931,14 +3928,13 @@ ostree_repo_checkout_tree (OstreeRepo *self,
{
const char *name;
guint32 type;
ot_lobj GFile *dest_path = NULL;
ot_lobj GFile *src_child = NULL;
name = g_file_info_get_attribute_byte_string (file_info, "standard::name");
type = g_file_info_get_attribute_uint32 (file_info, "standard::type");
g_clear_object (&dest_path);
dest_path = g_file_get_child (destination, name);
g_clear_object (&src_child);
src_child = g_file_get_child ((GFile*)source, name);
if (type == G_FILE_TYPE_DIRECTORY)