Skip to content

return g_variant_new_maybe for NULL variants #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kangie wants to merge 1 commit into from
Closed

return g_variant_new_maybe for NULL variants #624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions modulemd/modulemd-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,12 @@ destroy_variant_data (gpointer data)
GVariant *
modulemd_variant_deep_copy (GVariant *variant)
{
// g_variant_store will not accept NULL from 2.84.1
if (variant == NULL)
{
return g_variant_ref_sink (g_variant_new_maybe (G_VARIANT_TYPE_VARIANT, NULL));
}

Comment on lines 362 to +369
Copy link
Collaborator

@sgallagher sgallagher Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're passeed NULL for input to a copy function, shouldn't we just return NULL instead? There's obviously nothing to actually copy, so creating an empty variant seems odd.

It's also entirely possible that we need to figure out why it's getting passed NULL in the first place. Ticket #623 suggests that interacting with certain repos causes this, so could you figure out how to recreate the problem (ideally in the test suite)?

const GVariantType *data_type = g_variant_get_type (variant);
gsize data_size = g_variant_get_size (variant);
gpointer data = g_malloc0 (data_size);
Expand Down
Loading