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

traverse: Set an explicit error when loading a corrupted commit 

I had a empty files for a .commit and .dirmeta, and previously we were
segfaulting.
This commit is contained in:
Colin Walters 2012-08-27 11:39:44 -04:00
parent 7b977beec8
commit 5038a1930f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libostree/ostree-traverse.c
View File

@ -171,6 +171,14 @@ ostree_traverse_commit (OstreeRepo *repo,
g_variant_get_child (commit, 7, "@ay", &meta_csum_bytes);
g_free (tmp_checksum);
if (G_UNLIKELY (g_variant_n_children (meta_csum_bytes) == 0))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Corrupted commit '%s'; invalid tree metadata",
commit_checksum);
goto out;
}
tmp_checksum = ostree_checksum_from_bytes_v (meta_csum_bytes);
key = ostree_object_name_serialize (tmp_checksum, OSTREE_OBJECT_TYPE_DIR_META);
g_hash_table_replace (inout_reachable, key, key);
@ -178,6 +186,14 @@ ostree_traverse_commit (OstreeRepo *repo,
g_variant_get_child (commit, 6, "@ay", &content_csum_bytes);
g_free (tmp_checksum);
if (G_UNLIKELY (g_variant_n_children (content_csum_bytes) == 0))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Corrupted commit '%s'; invalid tree content",
commit_checksum);
goto out;
}
tmp_checksum = ostree_checksum_from_bytes_v (content_csum_bytes);
if (!ostree_traverse_dirtree (repo, tmp_checksum, inout_reachable, cancellable, error))
goto out;