rpms/gimp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix crash in lcms plug-in

Browse Source
This commit is contained in:
Nils Philippsen 2013-11-07 13:16:12 +01:00
parent b83f435145
commit f999a9886f
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gimp-2.8.8-lcms-profile-crash.patch Normal file
View File

@ -0,0 +1,48 @@
From 9962e79ff981778416081c5832c63ab6c78e9e6a Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 7 Nov 2013 13:08:02 +0100
Subject: [PATCH] patch: lcms-profile-crash
Squashed commit of the following:
commit c733e96b9230ef22c41779171890af885d196b95
Author: Michael Natterer <mitch@gimp.org>
Date: Mon Nov 4 23:17:41 2013 +0100
Bug 709857 - Lcms plugin crashes if RGB profile does not exist
Always check the return value of lcms_load_profile(config->rgb_profile)
and use the builtin sRGB profile if it returns NULL.
(cherry picked from commit 961d03d795e1ab32923f31e7f979f601403cdf41)
(cherry picked from commit dc6ccc17495bcabbd96d4c18616cb4b57bd07ea6)
---
plug-ins/common/lcms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 3fa26db..87373fc 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -1493,7 +1493,7 @@ lcms_icc_combo_box_new (GimpColorConfig *config,
gchar *history;
gchar *label;
gchar *name;
- cmsHPROFILE profile;
+ cmsHPROFILE profile = NULL;
dialog = lcms_icc_file_chooser_dialog_new ();
history = gimp_personal_rc_file ("profilerc");
@@ -1508,7 +1508,8 @@ lcms_icc_combo_box_new (GimpColorConfig *config,
if (config->rgb_profile)
profile = lcms_load_profile (config->rgb_profile, NULL);
- else
+
+ if (! profile)
profile = cmsCreate_sRGBProfile ();
name = lcms_icc_profile_get_desc (profile);
--
1.8.4.2

8
gimp.spec
View File

@ -206,6 +206,10 @@ Patch0: gimp-%{version}%{dashprerel}-git%{gitrev}.patch.bz2
# Fedora specific.
Patch1: gimp-2.8.2-cm-system-monitor-profile-by-default.patch
# Avoid crash in lcms plug-in.
# Upstream commit dc6ccc17495bcabbd96d4c18616cb4b57bd07ea6
Patch2: gimp-2.8.8-lcms-profile-crash.patch
# use external help browser directly if help browser plug-in is not built
Patch100: gimp-2.8.6-external-help-browser.patch
@ -295,6 +299,7 @@ EOF
%endif
%patch1 -p1 -b .cm-system-monitor-profile-by-default
%patch2 -p1 -b .lcms-profile-crash
%if ! %{with helpbrowser}
%patch100 -p1 -b .external-help-browser
@ -608,6 +613,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Thu Nov 07 2013 Nils Philippsen <nils@redhat.com>
- fix crash in lcms plug-in
* Mon Nov 04 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.8-1
- version 2.8.8