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

- fix ppmtopict buffer underflow

Browse Source 
- fix memory corruption in pnmtopclxl
This commit is contained in:
Jindrich Novy 2012-06-13 15:49:08 +02:00
parent e36ef68e1a
commit 123a01124f
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netpbm-pnmtopclxl.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up netpbm-10.58.01/converter/other/pnmtopclxl.c.pnmtopclxl netpbm-10.58.01/converter/other/pnmtopclxl.c
--- netpbm-10.58.01/converter/other/pnmtopclxl.c.pnmtopclxl 2012-04-09 15:31:42.000000000 +0200
+++ netpbm-10.58.01/converter/other/pnmtopclxl.c 2012-06-13 15:39:17.566141565 +0200
@@ -269,10 +269,10 @@ XY_RLEnew(size_t const size) {
MALLOCVAR(rleP);
if (rleP) {
- rleP->fbuf = malloc(size);
+ rleP->fbufsize = MAX(1024, size);
+ rleP->fbuf = malloc(rleP->fbufsize);
if (rleP->fbuf) {
- rleP->fbufsize = MAX(1024, size);
retval = rleP;
} else
retval = NULL;

12
netpbm-ppmtopict.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up netpbm-10.58.01/converter/ppm/ppmtopict.c.ppmtopict netpbm-10.58.01/converter/ppm/ppmtopict.c
--- netpbm-10.58.01/converter/ppm/ppmtopict.c.ppmtopict 2012-06-13 09:52:42.000000000 +0200
+++ netpbm-10.58.01/converter/ppm/ppmtopict.c 2012-06-13 11:33:11.134747363 +0200
@@ -200,7 +200,7 @@ putRow(FILE * const ifP,
pixel * const rowpixels,
char * const packed) {
- unsigned int i;
+ int i;
unsigned int count;
unsigned int run;
unsigned int rep;

11
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.58.01 Version: 10.58.01
Release: 2%{?dist} Release: 3%{?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
@ -31,6 +31,8 @@ Patch20: netpbm-noppmtompeg.patch
Patch21: netpbm-cmuwtopbm.patch Patch21: netpbm-cmuwtopbm.patch
Patch22: netpbm-pamtojpeg2k.patch Patch22: netpbm-pamtojpeg2k.patch
Patch23: netpbm-manfix.patch Patch23: netpbm-manfix.patch
Patch24: netpbm-ppmtopict.patch
Patch25: netpbm-pnmtopclxl.patch
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel
@ -102,6 +104,8 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
%patch21 -p1 -b .cmuwtopbmfix %patch21 -p1 -b .cmuwtopbmfix
%patch22 -p1 -b .pamtojpeg2kfix %patch22 -p1 -b .pamtojpeg2kfix
%patch23 -p1 -b .manfix %patch23 -p1 -b .manfix
%patch24 -p1 -b .ppmtopict
%patch25 -p1 -b .pnmtopclxl
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
rm -rf converter/other/jpeg2000/libjasper/ rm -rf converter/other/jpeg2000/libjasper/
@ -131,6 +135,7 @@ sed -i -e 's/^SUBDIRS = libjasper/SUBDIRS =/' converter/other/jpeg2000/Makefile
EOF EOF
TOP=`pwd` TOP=`pwd`
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" \
@ -245,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/* %doc userguide/*
%changelog %changelog
* Wed Jun 13 2012 Jindrich Novy <jnovy@redhat.com> 10.58.01-3
- fix ppmtopict buffer underflow
- fix memory corruption in pnmtopclxl
* Sun May 06 2012 Jindrich Novy <jnovy@redhat.com> 10.58.01-2 * Sun May 06 2012 Jindrich Novy <jnovy@redhat.com> 10.58.01-2
- rebuild against new libtiff - rebuild against new libtiff