- pbmtog3 won't segfault on 64bit arches (#220739)

This commit is contained in:
Jindrich Novy 2006-12-28 11:01:44 +00:00
parent c13f014be8
commit e58c9886e3
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- 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;
}

View File

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats. Summary: A library for handling different graphics file formats.
Name: netpbm Name: netpbm
Version: 10.35 Version: 10.35
Release: 8%{?dist} Release: 9%{?dist}
License: freeware License: freeware
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/ URL: http://netpbm.sourceforge.net/
@ -22,6 +22,7 @@ Patch12: netpbm-10.33-ppmtompeg.patch
Patch13: netpbm-10.33-multilib.patch Patch13: netpbm-10.33-multilib.patch
Patch14: netpbm-10.34-pamscale.patch Patch14: netpbm-10.34-pamscale.patch
Patch15: netpbm-10.35-ppmquantall.patch Patch15: netpbm-10.35-ppmquantall.patch
Patch16: netpbm-10.35-pbmtog3segfault.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -81,6 +82,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch13 -p1 -b .multilib %patch13 -p1 -b .multilib
%patch14 -p1 -b .pamscale %patch14 -p1 -b .pamscale
%patch15 -p1 -b .pqall %patch15 -p1 -b .pqall
%patch16 -p1 -b .pbmtog3segfault
##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@ -187,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
%{_mandir}/man5/* %{_mandir}/man5/*
%changelog %changelog
* Thu Dec 28 2006 Jindrich Novy <jnovy@redhat.com> 10.35-9
- pbmtog3 won't segfault on 64bit arches (#220739)
* Tue Dec 19 2006 Jindrich Novy <jnovy@redhat.com> 10.35-8 * Tue Dec 19 2006 Jindrich Novy <jnovy@redhat.com> 10.35-8
- remove bogus man pages (#220112, #220113) - remove bogus man pages (#220112, #220113)
- overflow2() no more conflicts with libgd.so (#216116) - overflow2() no more conflicts with libgd.so (#216116)