sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

edid: Ensure strings owned by MetaEdidInfo are freed

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3888>
This commit is contained in:
Sebastian Keller 2024-07-15 23:31:58 +02:00
parent a541aa9a8c
commit 31e027d1b1
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/backends/edid-parse.c
View file

@ -595,7 +595,16 @@ meta_edid_info_new_parse (const uint8_t *edid,
} }
else else
{ {
g_free (info); meta_edid_info_free (info);
return NULL; return NULL;
} }
} }
void
meta_edid_info_free (MetaEdidInfo *info)
{
g_clear_pointer (&info->manufacturer_code, g_free);
g_clear_pointer (&info->dsc_serial_number, g_free);
g_clear_pointer (&info->dsc_product_name, g_free);
g_free (info);
}

5
src/backends/edid.h
View file

@ -96,3 +96,8 @@ struct _MetaEdidInfo
META_EXPORT_TEST META_EXPORT_TEST
MetaEdidInfo *meta_edid_info_new_parse (const uint8_t *edid, MetaEdidInfo *meta_edid_info_new_parse (const uint8_t *edid,
size_t size); size_t size);
META_EXPORT_TEST
void meta_edid_info_free (MetaEdidInfo *info);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaEdidInfo, meta_edid_info_free)

2
src/backends/meta-output.c
View file

@ -111,7 +111,7 @@ meta_output_info_unref (MetaOutputInfo *output_info)
g_free (output_info->product); g_free (output_info->product);
g_free (output_info->serial); g_free (output_info->serial);
g_free (output_info->edid_checksum_md5); g_free (output_info->edid_checksum_md5);
g_free (output_info->edid_info); g_clear_pointer (&output_info->edid_info, meta_edid_info_free);
g_free (output_info->modes); g_free (output_info->modes);
g_free (output_info->possible_crtcs); g_free (output_info->possible_crtcs);
g_free (output_info->possible_clones); g_free (output_info->possible_clones);

2
src/tests/edid-tests.c
View file

@ -65,7 +65,7 @@ int
main (int argc, main (int argc,
char **argv) char **argv)
{ {
MetaEdidInfo *edid_info; g_autoptr (MetaEdidInfo) edid_info = NULL;
edid_info = meta_edid_info_new_parse (edid_blob,edid_blob_len); edid_info = meta_edid_info_new_parse (edid_blob,edid_blob_len);
g_assert_nonnull (edid_info); g_assert_nonnull (edid_info);

2
src/wayland/meta-wayland-drm-lease.c
View file

@ -357,7 +357,7 @@ get_connector_description (MetaKmsConnector *kms_connector)
{ {
const MetaKmsConnectorState *connector_state; const MetaKmsConnectorState *connector_state;
gconstpointer edid_data; gconstpointer edid_data;
g_autofree MetaEdidInfo *edid_info = NULL; g_autoptr (MetaEdidInfo) edid_info = NULL;
size_t edid_size; size_t edid_size;
g_autofree char *vendor = NULL; g_autofree char *vendor = NULL;
g_autofree char *product = NULL; g_autofree char *product = NULL;