rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix ppmpat segfault when using -camo option (#541568)

Browse Source
This commit is contained in:
Jindrich Novy 2009-11-27 05:40:12 +00:00
parent e97eda6d4b
commit e335a42392
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netpbm-ppmpat-segfault.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up netpbm-10.47.04/lib/libppmd.c.ppmpat-segfault netpbm-10.47.04/lib/libppmd.c
--- netpbm-10.47.04/lib/libppmd.c.ppmpat-segfault 2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libppmd.c 2009-11-27 06:31:32.000000000 +0100
@@ -1057,8 +1057,8 @@ ppmd_fill_drawprocp(pixel ** const p
if (fh->coords == NULL)
pm_error("out of memory enlarging a fillhandle");
- ocp = &(fh->coords[fh->n - 1]);
}
+ ocp = &(fh->coords[fh->n - 1]);
/* Check for extremum and set the edge number. */
if (fh->n == 0) {

10
netpbm.spec
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.47.04 Version: 10.47.04
Release: 1%{?dist} Release: 2%{?dist}
# See copyright_summary for details # See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
@ -26,6 +26,7 @@ Patch12: netpbm-pamscale.patch
Patch13: netpbm-glibc.patch Patch13: netpbm-glibc.patch
Patch14: netpbm-pnmtofiasco-stdin.patch Patch14: netpbm-pnmtofiasco-stdin.patch
Patch15: netpbm-svgtopam.patch Patch15: netpbm-svgtopam.patch
Patch16: netpbm-ppmpat-segfault.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, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel BuildRequires: libX11-devel, python, jasper-devel
@ -82,6 +83,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch13 -p1 -b .glibc %patch13 -p1 -b .glibc
%patch14 -p1 -b .pnmtofiasco-stdin %patch14 -p1 -b .pnmtofiasco-stdin
%patch15 -p1 -b .svgtopam %patch15 -p1 -b .svgtopam
%patch16 -p1 -b .ppmpat-segfault
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
@ -109,10 +111,11 @@ sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
EOF EOF
TOP=`pwd` TOP=`pwd`
# CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
make \ make \
CC="%{__cc}" \ CC="%{__cc}" \
LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \ LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \ CFLAGS="-g3 -fPIC -flax-vector-conversions" \
LADD="-lm" \ LADD="-lm" \
JPEGINC_DIR=%{_includedir} \ JPEGINC_DIR=%{_includedir} \
PNGINC_DIR=%{_includedir} \ PNGINC_DIR=%{_includedir} \
@ -210,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/ %{_datadir}/netpbm/
%changelog %changelog
* Fri Nov 27 2009 Jindrich Novy <jnovy@redhat.com> 10.47.04-2
- fix ppmpat segfault when using -camo option (#541568)
* Wed Oct 21 2009 Jindrich Novy <jnovy@redhat.com> 10.47.04-1 * Wed Oct 21 2009 Jindrich Novy <jnovy@redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525) - update to 10.47.04 (it is now stable) (#529525)