diff --git a/argyllcms-0.70-scanin-doublefree-fix.patch b/argyllcms-0.70-scanin-doublefree-fix.patch new file mode 100644 index 0000000..d6081a4 --- /dev/null +++ b/argyllcms-0.70-scanin-doublefree-fix.patch @@ -0,0 +1,11 @@ +diff -u argyll_orig/scanin/scanrd.c argyll/scanin/scanrd.c +--- argyll_orig/scanin/scanrd.c 2008-01-08 00:04:01.000000000 +0100 ++++ argyll/scanin/scanrd.c 2008-01-08 04:21:38.000000000 +0100 +@@ -2908,6 +2908,7 @@ + sp->P[e] = -2.0; /* Signal no value */ + free(s->sbend[s->cei]->ps[0]); /* Free up histogram array */ + s->sbend[s->cei]->active = 0; ++ s->cei++; + END_FOR_ALL_ITEMS(sp); + + return 0; diff --git a/argyllcms.spec b/argyllcms.spec index f8fb769..c7798a3 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -4,7 +4,7 @@ Name: argyllcms Version: 0.70 -Release: 0.8%{?alphatag}%{?dist} +Release: 0.9%{?alphatag}%{?dist} Summary: ICC compatible color management system Group: User Interface/X @@ -17,6 +17,8 @@ Source2: %{name}-0.70-color-device-file.policy Patch0: %{name}-0.70-build.patch # Patch by Stefan Brüns, bz421921#c18 Patch1: %{name}-0.70-printf.patch +# Patch by Stefan Brüns, bz421921#c24 +Patch2: %{name}-0.70-scanin-doublefree-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: jam, libtiff-devel, libusb-devel @@ -61,8 +63,10 @@ This package contains the Argyll color management system documentation. rm -fr tiff libusb libusbw # Make argyllcms actually build on a modern Linux system %patch0 -p1 -b .build -# Do not use printf as a function name + +# Code fixes %patch1 -p1 -b .printf +%patch2 -p1 -b .scanin %build @@ -178,6 +182,8 @@ rm -rf %{buildroot} %changelog * Thu Feb 8 2008 Nicolas Mailhot +- 0.70-0.8.Beta9 +✓ Another code fix (Stefan Brüns) - 0.70-0.8.Beta8 ✓ update to Stefan Brüns' latest safe-printf patch (bz421921#c18)