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

color-device: Don't close lcms profile on error from cd_icc_load_handle

Browse source 
As implemented in colord 1.4.6, cd_icc_load_handle() has three possible
results:

1. success, taking ownership of the profile;
2. failure because cmsGetProfileContextID returns NULL, *not* taking
   ownership of the profile;
3. failure in cd_icc_load(), taking ownership of the profile.

The previous commit ensures that we are not in case 2.

In case 3 where cd_icc_load() fails, ownership was already given to
the colord CdIcc object, so it will be freed when the g_autoptr unrefs
the CdIcc, and we must not free it again: that would be a double-free,
potentially resulting in memory corruption.

Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2659
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2877>
This commit is contained in:
Simon McVittie 2023-03-01 10:12:12 +00:00 committed by Marge Bot
parent e2be2d271b
commit ed12df1099
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/backends/meta-color-device.c
View file

@ -889,12 +889,10 @@ create_icc_profile_from_edid (MetaColorDevice *color_device,
cmsSetHeaderRenderingIntent (lcms_profile, INTENT_PERCEPTUAL); cmsSetHeaderRenderingIntent (lcms_profile, INTENT_PERCEPTUAL);
cmsSetDeviceClass (lcms_profile, cmsSigDisplayClass); cmsSetDeviceClass (lcms_profile, cmsSigDisplayClass);
if (!cd_icc_load_handle (cd_icc, lcms_profile, g_warn_if_fail (cmsGetProfileContextID (lcms_profile));
if (!cd_icc_load_handle (cd_icc, g_steal_pointer (&lcms_profile),
CD_ICC_LOAD_FLAGS_PRIMARIES, error)) CD_ICC_LOAD_FLAGS_PRIMARIES, error))
{ return NULL;
cmsCloseProfile (lcms_profile);
return NULL;
}
cd_icc_add_metadata (cd_icc, CD_PROFILE_PROPERTY_FILENAME, file_path); cd_icc_add_metadata (cd_icc, CD_PROFILE_PROPERTY_FILENAME, file_path);
cd_icc_add_metadata (cd_icc, cd_icc_add_metadata (cd_icc,