keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error handling in rpmhdrs_rpmdbv()

Browse Source 
Letting GErrors pile up is wrong; either exit the function or clear the
GError (perhaps with a console warning).

In this case we tolerate missing database files (because users are free
to delete them), and build the checksum from whatever data is available.
Seems weird, but that's how I'm told it's meant to work.  Bail out on
any other type of error.
This commit is contained in:
Matthew Barnes 2014-12-08 15:15:32 -05:00
parent 979e88432a
commit 5973ea42d7
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpmostree-db-builtin-version.c
View File

@ -71,6 +71,8 @@ _builtin_db_version (OstreeRepo *repo, GFile *rpmdbdir, GPtrArray *revs,
rpmdbv = rpmhdrs_rpmdbv (rpmrev->root, rpmrev->rpmdb,
cancellable, error);
if (rpmdbv == NULL)
goto out;
// FIXME: g_console?
if (!g_str_equal (rev, rpmrev->commit))

43
src/rpmostree-rpm-util.c
View File

@ -471,6 +471,7 @@ rpmhdrs_rpmdbv (GFile *root, struct RpmHeaders *l1,
{
GChecksum *checksum = g_checksum_new (G_CHECKSUM_SHA1);
gs_free char *checksum_cstr = NULL;
char *ret = NULL;
int num = 0;
while (num < l1->hs->len)
@ -483,23 +484,46 @@ rpmhdrs_rpmdbv (GFile *root, struct RpmHeaders *l1,
gs_free char *envra = pkg_envra_strdup (pkg);
gsize tbytes_read = 0;
gsize dbytes_read = 0;
GError *local_error = NULL;
g_checksum_update (checksum, (guint8*)envra, strlen(envra));
tin = pkg_yumdb_file_read (root, pkg, "checksum_type", cancellable,error);
if (!tin)
continue;
tin = pkg_yumdb_file_read (root, pkg, "checksum_type", cancellable, &local_error);
/* Tolerate missing database files. */
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_clear_error (&local_error);
continue;
}
if (local_error != NULL)
{
g_propagate_error (error, local_error);
goto out;
}
din = pkg_yumdb_file_read (root, pkg, "checksum_data", cancellable,error);
if (!din)
continue;
/* Tolerate missing database files. */
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
g_clear_error (&local_error);
continue;
}
if (local_error != NULL)
{
g_propagate_error (error, local_error);
goto out;
}
if (!g_input_stream_read_all (tin, tbuf, sizeof(tbuf), &tbytes_read,
cancellable, error))
continue;
goto out;
if (!g_input_stream_read_all (din, dbuf, sizeof(dbuf), &dbytes_read,
cancellable, error))
continue;
goto out;
if (tbytes_read >= 512)
continue; // should be == len(md5) or len(sha256) etc.
@ -512,9 +536,12 @@ rpmhdrs_rpmdbv (GFile *root, struct RpmHeaders *l1,
checksum_cstr = g_strdup (g_checksum_get_string (checksum));
ret = g_strdup_printf ("%u:%s", num, checksum_cstr);
out:
g_checksum_free (checksum);
return g_strdup_printf ("%u:%s", num, checksum_cstr);
return ret;
}
/* glib? */