rpms/netpbm/devel netpbm-10.35-pbmtog3segfault.patch, NONE, 1.1 netpbm.spec, 1.83, 1.84

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7744

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.35-pbmtog3segfault.patch 
Log Message:
- pbmtog3 won't segfault on 64bit arches (#220739)


netpbm-10.35-pbmtog3segfault.patch:
 pbmtog3.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-10.35-pbmtog3segfault.patch ---
--- netpbm-10.35/converter/pbm/pbmtog3.c.pbmtog3segfault	2006-09-18 12:20:32.000000000 +0200
+++ netpbm-10.35/converter/pbm/pbmtog3.c	2006-12-28 11:43:19.000000000 +0100
@@ -371,7 +371,7 @@
                 r2 <<= c++; r2 <<= 1;  k += c; 
             } 
         }
-        if (milepost[n - 1] != cols) 
+        if (!n || milepost[n - 1] != cols) 
             milepost[n++] = cols;
         *lengthP = n;
     }


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- netpbm.spec	19 Dec 2006 13:47:13 -0000	1.83
+++ netpbm.spec	28 Dec 2006 11:01:44 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.35
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -22,6 +22,7 @@
 Patch13: netpbm-10.33-multilib.patch
 Patch14: netpbm-10.34-pamscale.patch
 Patch15: netpbm-10.35-ppmquantall.patch
+Patch16: netpbm-10.35-pbmtog3segfault.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
 BuildRequires: libX11-devel
@@ -81,6 +82,7 @@
 %patch13 -p1 -b .multilib
 %patch14 -p1 -b .pamscale
 %patch15 -p1 -b .pqall
+%patch16 -p1 -b .pbmtog3segfault
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -187,6 +189,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Thu Dec 28 2006 Jindrich Novy <jnovy at redhat.com> 10.35-9
+- pbmtog3 won't segfault on 64bit arches (#220739)
+
 * Tue Dec 19 2006 Jindrich Novy <jnovy at redhat.com> 10.35-8
 - remove bogus man pages (#220112, #220113)
 - overflow2() no more conflicts with libgd.so (#216116)