rpms/argyllcms/devel argyllcms-0.70-scanin-doublefree-fix.patch, NONE, 1.1 argyllcms.spec, 1.1, 1.2

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/argyllcms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642/devel

Modified Files:
	argyllcms.spec 
Added Files:
	argyllcms-0.70-scanin-doublefree-fix.patch 
Log Message:
another code fix

argyllcms-0.70-scanin-doublefree-fix.patch:

--- NEW FILE argyllcms-0.70-scanin-doublefree-fix.patch ---
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;


Index: argyllcms.spec
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argyllcms.spec	8 Feb 2008 18:51:41 -0000	1.1
+++ argyllcms.spec	8 Feb 2008 20:53:49 -0000	1.2
@@ -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 @@
 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 @@
 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 @@
 
 %changelog
 * Thu Feb 8 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 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)