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

core: Fix duplication bug in _ostree_detached_metadata_append_gpg_sig() 

g_variant_builder_add() does not replace identical keys in a VARDICT
variant, so signing a commit multiple times results in multiple copies
of "ostree.gpgsigs" in the metadata.  And since g_variant_lookup_value()
stops on the first match, subsequent signatures have no net effect.

Instead of GVariantBuilder use GVariantDict, which behaves more like a
hash table.
This commit is contained in:
Matthew Barnes 2015-03-02 14:43:41 -05:00
parent c04f9f47e3
commit c107561171
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1926,25 +1926,24 @@ GVariant *
_ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata, _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata,
GBytes *signature_bytes) GBytes *signature_bytes)
{ {
GVariantBuilder *builder = NULL; GVariantDict metadata_dict;
gs_unref_variant GVariant *signaturedata = NULL; gs_unref_variant GVariant *signature_data = NULL;
gs_unref_variant_builder GVariantBuilder *signature_builder = NULL; gs_unref_variant_builder GVariantBuilder *signature_builder = NULL;
if (existing_metadata) g_variant_dict_init (&metadata_dict, existing_metadata);
{
builder = ot_util_variant_builder_from_variant (existing_metadata, G_VARIANT_TYPE ("a{sv}")); signature_data = g_variant_dict_lookup_value (&metadata_dict,
signaturedata = g_variant_lookup_value (existing_metadata, _OSTREE_METADATA_GPGSIGS_NAME, _OSTREE_METADATA_GPGSIGS_TYPE); _OSTREE_METADATA_GPGSIGS_NAME,
if (signaturedata) _OSTREE_METADATA_GPGSIGS_TYPE);
signature_builder = ot_util_variant_builder_from_variant (signaturedata, _OSTREE_METADATA_GPGSIGS_TYPE);
} /* signature_data may be NULL */
if (!builder) signature_builder = ot_util_variant_builder_from_variant (signature_data, _OSTREE_METADATA_GPGSIGS_TYPE);
builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
if (!signature_builder)
signature_builder = g_variant_builder_new (_OSTREE_METADATA_GPGSIGS_TYPE);
g_variant_builder_add (signature_builder, "@ay", ot_gvariant_new_ay_bytes (signature_bytes)); g_variant_builder_add (signature_builder, "@ay", ot_gvariant_new_ay_bytes (signature_bytes));
g_variant_builder_add (builder, "{sv}", _OSTREE_METADATA_GPGSIGS_NAME, g_variant_builder_end (signature_builder)); g_variant_dict_insert_value (&metadata_dict,
_OSTREE_METADATA_GPGSIGS_NAME,
g_variant_builder_end (signature_builder));
return g_variant_ref_sink (g_variant_builder_end (builder)); return g_variant_dict_end (&metadata_dict);
} }