From b3d2df75214ce923d2c4ba2978c0e70072aac005 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Oct 21 2009 15:11:20 +0000 Subject: - update to 10.47.04 (it is now stable) (#529525) --- diff --git a/netpbm-10.17-time.patch b/netpbm-10.17-time.patch deleted file mode 100644 index 8caf944..0000000 --- a/netpbm-10.17-time.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netpbm-10.17/converter/other/fiasco/config.h.time 2001-05-28 02:43:11.000000000 +0200 -+++ netpbm-10.17/converter/other/fiasco/config.h 2003-09-08 15:23:17.000000000 +0200 -@@ -19,7 +19,7 @@ - #define STDC_HEADERS 1 - - /* Define if you can safely include both and . */ --#define TIME_WITH_SYS_TIME 1 -+/* #undef TIME_WITH_SYS_TIME 1 */ - - /* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -@@ -79,7 +79,7 @@ - #define HAVE_STRING_H 1 - - /* Define if you have the header file. */ --#define HAVE_SYS_TIME_H 1 -+/* #undef HAVE_SYS_TIME_H 1 */ - - /* Define if you have the header file. */ - #define HAVE_UNISTD_H 1 diff --git a/netpbm-10.19-message.patch b/netpbm-10.19-message.patch deleted file mode 100644 index 1f2fcab..0000000 --- a/netpbm-10.19-message.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netpbm-10.32/converter/other/giftopnm.c.message 2006-02-15 23:53:45.000000000 +0100 -+++ netpbm-10.32/converter/other/giftopnm.c 2006-02-27 14:47:32.000000000 +0100 -@@ -1401,7 +1401,7 @@ convertImages(FILE * const ifP, - imageSeq, imageSeq>1?"s":"" ); - } else { - if (verbose) -- pm_message("Reading Image Sequence %d", imageSeq); -+ pm_message("Reading Image Sequence %d", imageSeq+1); - convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), - imageout_file, alphafile, gifScreen, gif89); - } diff --git a/netpbm-10.22-security2.patch b/netpbm-10.22-security2.patch deleted file mode 100644 index 8628353..0000000 --- a/netpbm-10.22-security2.patch +++ /dev/null @@ -1,425 +0,0 @@ -diff -up netpbm-10.35.48/converter/other/anytopnm.security2 netpbm-10.35.48/converter/other/anytopnm ---- netpbm-10.35.48/converter/other/anytopnm.security2 2008-08-03 22:07:04.000000000 +0200 -+++ netpbm-10.35.48/converter/other/anytopnm 2008-08-04 07:11:46.000000000 +0200 -@@ -506,11 +506,7 @@ else - inputFile="-" - fi - --tempdir="${TMPDIR-/tmp}/anytopnm.$$" --mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;} --chmod 700 $tempdir -- --trap 'rm -rf $tempdir' 0 -+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1 - - # Take out all spaces - # Find the filename extension for last-ditch efforts later -@@ -536,9 +532,17 @@ if [ "$filetype" = "unknown" ]; then - echo "$progname: unknown file type. " \ - "'file' says mime type is '$mimeType', " 1>&2 - echo "type description is '$typeDescription'" 1>&2 -+ if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+ fi -+ - exit 1 - fi - - convertIt $file $filetype - -+if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+fi -+ - exit 0 -diff -up netpbm-10.35.48/editor/pamstretch-gen.security2 netpbm-10.35.48/editor/pamstretch-gen ---- netpbm-10.35.48/editor/pamstretch-gen.security2 2008-08-03 22:06:45.000000000 +0200 -+++ netpbm-10.35.48/editor/pamstretch-gen 2008-08-04 07:11:46.000000000 +0200 -@@ -31,10 +31,7 @@ if [ "$1" = "" ]; then - exit 1 - fi - --tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$" --mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;} --chmod 700 $tempdir --tempfile=$tempdir/pnmig -+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1 - - trap 'rm -rf $tempdir' 0 1 3 15 - -diff -up netpbm-10.35.48/editor/pnmmargin.security2 netpbm-10.35.48/editor/pnmmargin ---- netpbm-10.35.48/editor/pnmmargin.security2 2008-08-03 22:06:45.000000000 +0200 -+++ netpbm-10.35.48/editor/pnmmargin 2008-08-04 07:11:46.000000000 +0200 -@@ -11,16 +11,11 @@ - # documentation. This software is provided "as is" without express or - # implied warranty. - --tempdir="${TMPDIR-/tmp}/pnmmargin.$$" --mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;} --chmod 700 $tempdir -- --trap 'rm -rf $tempdir' 0 1 3 15 -- --tmp1=$tempdir/pnmm1 --tmp2=$tempdir/pnmm2 --tmp3=$tempdir/pnmm3 --tmp4=$tempdir/pnmm4 -+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1 -+tmp1="$tmpdir/tmp1" -+tmp2="$tmpdir/tmp2" -+tmp3="$tmpdir/tmp3" -+tmp4="$tmpdir/tmp4" - - color="-gofigure" - -@@ -39,6 +34,9 @@ while true ; do - shift - if [ ! ${1-""} ] ; then - echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 -+ if [ -d "$tmpdir" ]; then -+ rm -rf "$tmpdir" -+ fi - exit 1 - fi - color="$1" -@@ -46,6 +44,9 @@ while true ; do - ;; - -* ) - echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 -+ if [ -d "$tmpdir" ]; then -+ rm -rf "$tmpdir" -+ fi - exit 1 - ;; - * ) -@@ -56,6 +57,9 @@ done - - if [ ! ${1-""} ] ; then - echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 -+ if [ -d "$tmpdir" ]; then -+ rm -rf "$tmpdir" -+ fi - exit 1 - fi - size="$1" -@@ -63,6 +67,9 @@ shift - - if [ ${2-""} ] ; then - echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 -+ if [ -d "$tmpdir" ]; then -+ rm -rf "$tmpdir" -+ fi - exit 1 - fi - -@@ -86,3 +93,7 @@ pamflip -rotate90 $tmp2 > $tmp3 - # Cat things together. - pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4 - pnmcat -tb $tmp3 $tmp4 $tmp3 -+ -+if [ -d "$tmpdir" ]; then -+ rm -rf "$tmpdir" -+fi -diff -up netpbm-10.35.48/editor/ppmfade.security2 netpbm-10.35.48/editor/ppmfade ---- netpbm-10.35.48/editor/ppmfade.security2 2008-08-03 22:06:45.000000000 +0200 -+++ netpbm-10.35.48/editor/ppmfade 2008-08-04 07:11:46.000000000 +0200 -@@ -14,6 +14,7 @@ - # - #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - use strict; -+use File::Temp "tempdir"; - - my $SPREAD = 1; - my $SHIFT = 2; -@@ -116,20 +117,26 @@ if ($first_file ne "undefined") { - - print("Frames are " . $width . "W x " . $height . "H\n"); - -+# -+# We create a tmp-directory right here -+# -+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1); -+ -+ - if ($first_file eq "undefined") { - print "Fading from black to "; -- system("ppmmake \\#000 $width $height >junk1$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm"); - } else { - print "Fading from $first_file to "; -- system("cp", $first_file, "junk1$$.ppm"); -+ system("cp", $first_file, "$tmpdir/junk1$$.ppm"); - } - - if ($last_file eq "undefined") { - print "black.\n"; -- system("ppmmake \\#000 $width $height >junk2$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm"); - } else { - print "$last_file\n"; -- system("cp", $last_file, "junk2$$.ppm"); -+ system("cp", $last_file, "$tmpdir/junk2$$.ppm"); - } - - # -@@ -137,14 +144,14 @@ if ($last_file eq "undefined") { - # - - # Here's what our temporary files are: --# junk1$$.ppm: The original (fade-from) image --# junk2$$.ppm: The target (fade-from) image --# junk3$$.ppm: The frame of the fade for the current iteration of the --# the for loop. --# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate --# image to another, this is the first frame of that --# sequence. --# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence -+# $tmpdir/junk1$$.ppm: The original (fade-from) image -+# $tmpdir/junk2$$.ppm: The target (fade-from) image -+# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the -+# the for loop. -+# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate -+# image to another, this is the first frame of that -+# sequence. -+# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence - - my $i; # Frame number - for ($i = 1; $i <= $nframes; $i++) { -@@ -152,148 +159,148 @@ for ($i = 1; $i <= $nframes; $i++) { - if ($mode eq $SPREAD) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10]) * 100; -- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10])*100; -- system("ppmspread $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $SHIFT) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10])*100; -- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10]) * 100; -- system("ppmshift $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $RELIEF) { - if ($i == 1) { -- system("ppmrelief junk1$$.ppm >junk1r$$.ppm"); -+ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmrelief junk2$$.ppm >junk2r$$.ppm"); -+ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm"); - } - } elsif ($mode eq $OIL) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $EDGE) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BENTLEY) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BLOCK) { - if ($i <= 10) { - my $n = 1 - 1.9*$spline20[$i]; -- system("pamscale $n junk1$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk1$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = 1 - 1.9*$spline20[31-$i]; -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("cp", "junk3$$.ppm", "junk1a$$.ppm"); -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk2a$$.ppm"); -+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm"); - } - } elsif ($mode eq $MIX) { - my $fade_factor = sqrt(1/($nframes-$i+1)); -- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - print("Internal error: impossible mode value '$mode'\n"); - } - - my $outfile = sprintf("%s.%04d.ppm", $base_name, $i); -- system("cp", "junk3$$.ppm", $outfile); -+ system("cp", "$tmpdir/junk3$$.ppm", $outfile); - } - - # - # Clean up shop. - # --system("rm junk*$$.ppm"); -+system("rm $tmpdir/junk*$$.ppm"); - - exit(0); - -diff -up netpbm-10.35.48/editor/ppmquantall.security2 netpbm-10.35.48/editor/ppmquantall ---- netpbm-10.35.48/editor/ppmquantall.security2 2008-08-03 22:06:45.000000000 +0200 -+++ netpbm-10.35.48/editor/ppmquantall 2008-08-04 07:11:46.000000000 +0200 -@@ -70,13 +70,8 @@ for i in ${files[@]}; do - heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`) - done - --tempdir="${TMPDIR-/tmp}/ppmquantall.$$" --mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;} --chmod 700 $tempdir -- --trap 'rm -rf $tempdir' 0 1 3 15 -- --all=$tempdir/pqa.all.$$ -+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1 -+rm -f $all - - pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all - if [ $? != 0 ]; then -diff -up netpbm-10.35.48/editor/ppmshadow.security2 netpbm-10.35.48/editor/ppmshadow ---- netpbm-10.35.48/editor/ppmshadow.security2 2008-08-03 22:06:45.000000000 +0200 -+++ netpbm-10.35.48/editor/ppmshadow 2008-08-04 07:11:46.000000000 +0200 -@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) { - - - my $tmpdir = $ENV{TMPDIR} || "/tmp"; --my $ourtmp = "$tmpdir/ppmshadow$$"; --mkdir($ourtmp, 0777) or -- die("Unable to create directory for temporary files '$ourtmp"); -+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`); -+if ($? >> 8) { -+ die "Can't create directory for temporary files"; -+} - - # Process command line options - diff --git a/netpbm-10.23-security.patch b/netpbm-10.23-security.patch deleted file mode 100644 index 7d57058..0000000 --- a/netpbm-10.23-security.patch +++ /dev/null @@ -1,2077 +0,0 @@ -diff -up netpbm-10.35.46/analyzer/pgmhist.c.security netpbm-10.35.46/analyzer/pgmhist.c ---- netpbm-10.35.46/analyzer/pgmhist.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/analyzer/pgmhist.c 2008-06-24 09:04:21.000000000 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) - grayrow = pgm_allocrow( cols ); - - /* Build histogram. */ -+ overflow_add(maxval, 1); - MALLOCARRAY(hist, maxval + 1); - MALLOCARRAY(rcount, maxval + 1); - if ( hist == NULL || rcount == NULL ) -diff -up netpbm-10.35.46/analyzer/pgmtexture.c.security netpbm-10.35.46/analyzer/pgmtexture.c ---- netpbm-10.35.46/analyzer/pgmtexture.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/analyzer/pgmtexture.c 2008-06-24 09:04:21.000000000 +0200 -@@ -79,6 +79,9 @@ vector (int nl, int nh) - { - float *v; - -+ if(nh < nl) -+ pm_error("assert: h < l"); -+ overflow_add(nh - nl, 1); - MALLOCARRAY(v, (unsigned) (nh - nl + 1)); - if (v == NULL) - pm_error("Unable to allocate memory for a vector."); -@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n - float **m; - - /* allocate pointers to rows */ -+ if(nrh < nrl) -+ pm_error("assert: h < l"); -+ overflow_add(nrh - nrl, 1); - MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); - if (m == NULL) - pm_error("Unable to allocate memory for a matrix."); -@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n - m -= ncl; - - /* allocate rows and set pointers to them */ -+ if(nch < ncl) -+ pm_error("assert: h < l"); -+ overflow_add(nch - ncl, 1); - for (i = nrl; i <= nrh; i++) - { - MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); -diff -up netpbm-10.35.46/converter/other/gemtopnm.c.security netpbm-10.35.46/converter/other/gemtopnm.c ---- netpbm-10.35.46/converter/other/gemtopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/gemtopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -106,6 +106,7 @@ main(argc, argv) - - pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); - -+ overflow_add(cols, padright); - { - /* allocate input row data structure */ - int plane; -diff -up netpbm-10.35.46/converter/other/jpegtopnm.c.security netpbm-10.35.46/converter/other/jpegtopnm.c ---- netpbm-10.35.46/converter/other/jpegtopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/jpegtopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -828,6 +828,7 @@ convertImage(FILE * - /* Calculate output image dimensions so we can allocate space */ - jpeg_calc_output_dimensions(cinfoP); - -+ overflow2(cinfoP->output_width, cinfoP->output_components); - jpegbuffer = ((*cinfoP->mem->alloc_sarray) - ((j_common_ptr) cinfoP, JPOOL_IMAGE, - cinfoP->output_width * cinfoP->output_components, -diff -up netpbm-10.35.46/converter/other/pbmtopgm.c.security netpbm-10.35.46/converter/other/pbmtopgm.c ---- netpbm-10.35.46/converter/other/pbmtopgm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pbmtopgm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -47,6 +47,7 @@ main(int argc, char *argv[]) { - "than the image height (%u rows)", height, rows); - - outrow = pgm_allocrow(cols) ; -+ overflow2(width, height); - maxval = MIN(PGM_OVERALLMAXVAL, width*height); - pgm_writepgminit(stdout, cols, rows, maxval, 0) ; - -diff -up netpbm-10.35.46/converter/other/pngtopnm.c.security netpbm-10.35.46/converter/other/pngtopnm.c ---- netpbm-10.35.46/converter/other/pngtopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pngtopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -985,19 +985,24 @@ convertpng(FILE * const ifp, - pm_error ("couldn't allocate space for image"); - } - -- if (info_ptr->bit_depth == 16) -+ if (info_ptr->bit_depth == 16) { -+ overflow2(2, info_ptr->width); - linesize = 2 * info_ptr->width; -- else -+ } else - linesize = info_ptr->width; - -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -+ overflow2(2, linesize); - linesize *= 2; -- else -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) -+ } else -+ if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) { -+ overflow2(3, linesize); - linesize *= 3; -- else -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) -+ } else -+ if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) { -+ overflow2(4, linesize); - linesize *= 4; -+ } - - for (y = 0 ; y < info_ptr->height ; y++) { - png_image[y] = malloc (linesize); -diff -up netpbm-10.35.46/converter/other/pnmtoddif.c.security netpbm-10.35.46/converter/other/pnmtoddif.c ---- netpbm-10.35.46/converter/other/pnmtoddif.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pnmtoddif.c 2008-06-24 09:04:21.000000000 +0200 -@@ -484,6 +484,7 @@ int main(int argc, char *argv[]) - switch (PNM_FORMAT_TYPE(format)) { - case PBM_TYPE: - ip.bits_per_pixel = 1; -+ overflow_add(cols, 7); - ip.bytes_per_line = (cols + 7) / 8; - ip.spectral = 2; - ip.components = 1; -@@ -499,6 +500,7 @@ int main(int argc, char *argv[]) - ip.polarity = 2; - break; - case PPM_TYPE: -+ overflow2(cols, 3); - ip.bytes_per_line = 3 * cols; - ip.bits_per_pixel = 24; - ip.spectral = 5; -diff -up netpbm-10.35.46/converter/other/pnmtojpeg.c.security netpbm-10.35.46/converter/other/pnmtojpeg.c ---- netpbm-10.35.46/converter/other/pnmtojpeg.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pnmtojpeg.c 2008-06-24 09:04:21.000000000 +0200 -@@ -587,6 +587,8 @@ compute_rescaling_array(JSAMPLE ** const - const long half_maxval = maxval / 2; - long val; - -+ overflow_add(maxval, 1); -+ overflow2(maxval+1, sizeof(JSAMPLE)); - *rescale_p = (JSAMPLE *) - (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE, - (size_t) (((long) maxval + 1L) * -@@ -665,6 +667,7 @@ convert_scanlines(struct jpeg_compress_s - */ - - /* Allocate the libpnm output and compressor input buffers */ -+ overflow2(cinfo_p->image_width, cinfo_p->input_components); - buffer = (*cinfo_p->mem->alloc_sarray) - ((j_common_ptr) cinfo_p, JPOOL_IMAGE, - (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -@@ -932,7 +935,11 @@ read_scan_script (j_compress_ptr cinfo, - * want JPOOL_PERMANENT. - */ - const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info); -- jpeg_scan_info * const scan_info = -+ const jpeg_scan_info * scan_info; -+ -+ overflow2(nscans, sizeof(jpeg_scan_info)); -+ -+ scan_info = - (jpeg_scan_info *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, - scan_info_size); -diff -up netpbm-10.35.46/converter/other/pnmtops.c.security netpbm-10.35.46/converter/other/pnmtops.c ---- netpbm-10.35.46/converter/other/pnmtops.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pnmtops.c 2008-06-24 09:04:21.000000000 +0200 -@@ -184,16 +184,20 @@ parseCommandLine(int argc, char ** argv, - cmdlineP->canturn = !noturn; - cmdlineP->showpage = !noshowpage; - -+ overflow2(width, 72); - cmdlineP->width = width * 72; -+ overflow2(height, 72); - cmdlineP->height = height * 72; - -- if (imagewidthSpec) -+ if (imagewidthSpec) { -+ overflow2(imagewidth, 72); - cmdlineP->imagewidth = imagewidth * 72; -- else -+ } else - cmdlineP->imagewidth = 0; -- if (imageheightSpec) -+ if (imageheightSpec) { -+ overflow2(imageheight, 72); - cmdlineP->imageheight = imageheight * 72; -- else -+ } else - cmdlineP->imageheight = 0; - - if (!cmdlineP->psfilter && -diff -up netpbm-10.35.46/converter/other/pnmtorle.c.security netpbm-10.35.46/converter/other/pnmtorle.c ---- netpbm-10.35.46/converter/other/pnmtorle.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pnmtorle.c 2008-06-24 09:04:21.000000000 +0200 -@@ -19,6 +19,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * pnmtorle - A program which will convert pbmplus (ppm or pgm) images -diff -up netpbm-10.35.46/converter/other/pnmtosgi.c.security netpbm-10.35.46/converter/other/pnmtosgi.c ---- netpbm-10.35.46/converter/other/pnmtosgi.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/pnmtosgi.c 2008-06-24 09:04:21.000000000 +0200 -@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put - } - } - -+static void * -+xmalloc2(int x, int y) -+{ -+ void *mem; -+ -+ overflow2(x,y); -+ if( x * y == 0 ) -+ return NULL; -+ -+ mem = malloc2(x, y); -+ if( mem == NULL ) -+ pm_error("out of memory allocating %d bytes", x * y); -+ return mem; -+} -+ -+ - static void - put_big_short(short s) - { -@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int - #endif - - if( storage != STORAGE_VERBATIM ) { -+ overflow2(channels, rows); - MALLOCARRAY_NOFAIL(table, channels * rows); - MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); - } -@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no, - break; - case STORAGE_RLE: - tabrow = chan_no * rows + row; -+ overflow2(chan_no, rows); -+ overflow_add(chan_no* rows, row); - len = rle_compress(temp, cols); /* writes result into rletemp */ - channel[chan_no][row].length = len; - MALLOCARRAY(p, len); -diff -up netpbm-10.35.46/converter/other/rletopnm.c.security netpbm-10.35.46/converter/other/rletopnm.c ---- netpbm-10.35.46/converter/other/rletopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/rletopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -19,6 +19,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rletopnm - A conversion program to convert from Utah's "rle" image format -diff -up netpbm-10.35.46/converter/other/sgitopnm.c.security netpbm-10.35.46/converter/other/sgitopnm.c ---- netpbm-10.35.46/converter/other/sgitopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/sgitopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc - - if (ochan < 0) { - maxchannel = (head->zsize < 3) ? head->zsize : 3; -+ overflow2(head->ysize, maxchannel); - MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); - } else { - maxchannel = ochan + 1; - MALLOCARRAY_NOFAIL(image, head->ysize); - } -- if ( table ) -+ if ( table ) { -+ overflow2(head->xsize, 2); -+ overflow_add(head->xsize*2, 2); - MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); -+ } - - for( channel = 0; channel < maxchannel; channel++ ) { - #ifdef DEBUG -diff -up netpbm-10.35.46/converter/other/sirtopnm.c.security netpbm-10.35.46/converter/other/sirtopnm.c ---- netpbm-10.35.46/converter/other/sirtopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/sirtopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -69,6 +69,7 @@ char* argv[]; - } - break; - case PPM_TYPE: -+ overflow3(cols, rows, 3); - picsize = cols * rows * 3; - planesize = cols * rows; - if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) -diff -up netpbm-10.35.46/converter/other/tifftopnm.c.security netpbm-10.35.46/converter/other/tifftopnm.c ---- netpbm-10.35.46/converter/other/tifftopnm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/other/tifftopnm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -748,7 +748,8 @@ convertRasterByRows(FILE * const - if (scanbuf == NULL) - pm_error("can't allocate memory for scanline buffer"); - -- MALLOCARRAY(samplebuf, cols * spp); -+ /* samplebuf is unsigned int * !!! */ -+ samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp); - if (samplebuf == NULL) - pm_error ("can't allocate memory for row buffer"); - -diff -up netpbm-10.35.46/converter/pbm/icontopbm.c.security netpbm-10.35.46/converter/pbm/icontopbm.c ---- netpbm-10.35.46/converter/pbm/icontopbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/icontopbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -11,6 +11,7 @@ - */ - - #include -+#include - - #include "nstring.h" - #include "pbm.h" -@@ -87,6 +88,11 @@ ReadIconFile(FILE * const - if ( *heightP <= 0 ) - pm_error( "invalid height (must be positive): %d", *heightP ); - -+ if ( *widthP > INT_MAX - 16 || *widthP < 0) -+ pm_error( "invalid width: %d", *widthP); -+ -+ overflow2(*widthP + 16, *heightP); -+ - data_length = BitmapSize( *widthP, *heightP ); - *dataP = (short unsigned int *) malloc( data_length ); - if ( *dataP == NULL ) -diff -up netpbm-10.35.46/converter/pbm/mdatopbm.c.security netpbm-10.35.46/converter/pbm/mdatopbm.c ---- netpbm-10.35.46/converter/pbm/mdatopbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/mdatopbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -245,10 +245,13 @@ main(int argc, char **argv) { - pm_readlittleshort(infile, &yy); nInCols = yy; - } - -+ overflow2(nOutCols, 8); - nOutCols = 8 * nInCols; - nOutRows = nInRows; -- if (bScale) -+ if (bScale) { -+ overflow2(nOutRows, 2); - nOutRows *= 2; -+ } - - data = pbm_allocarray(nOutCols, nOutRows); - -diff -up netpbm-10.35.46/converter/pbm/mgrtopbm.c.security netpbm-10.35.46/converter/pbm/mgrtopbm.c ---- netpbm-10.35.46/converter/pbm/mgrtopbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/mgrtopbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -68,6 +68,8 @@ getinit(FILE * const file, - if (head.h_high < ' ' || head.l_high < ' ') - pm_error("Invalid width field in MGR header"); - -+ overflow_add(*colsP, pad); -+ - *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); - *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); - *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; -diff -up netpbm-10.35.46/converter/pbm/pbmto10x.c.security netpbm-10.35.46/converter/pbm/pbmto10x.c ---- netpbm-10.35.46/converter/pbm/pbmto10x.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmto10x.c 2008-06-24 09:04:21.000000000 +0200 -@@ -162,7 +162,7 @@ main(int argc, char * argv[]) { - res_60x72(); - - pm_close(ifp); -- exit(0); -+ return 0; - } - - -diff -up netpbm-10.35.46/converter/pbm/pbmto4425.c.security netpbm-10.35.46/converter/pbm/pbmto4425.c ---- netpbm-10.35.46/converter/pbm/pbmto4425.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmto4425.c 2008-06-24 09:04:21.000000000 +0200 -@@ -2,6 +2,7 @@ - - #include "nstring.h" - #include "pbm.h" -+#include - - static char bit_table[2][3] = { - {1, 4, 0x10}, -@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { - xres = vmap_width * 2; - yres = vmap_height * 3; - -- vmap = malloc(vmap_width * vmap_height * sizeof(char)); -+ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); - if(vmap == NULL) - { - pm_error( "Cannot allocate memory" ); -diff -up netpbm-10.35.46/converter/pbm/pbmtoascii.c.security netpbm-10.35.46/converter/pbm/pbmtoascii.c ---- netpbm-10.35.46/converter/pbm/pbmtoascii.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoascii.c 2008-06-24 09:04:21.000000000 +0200 -@@ -115,9 +115,11 @@ char* argv[]; - pm_usage( usage ); - - pbm_readpbminit( ifp, &cols, &rows, &format ); -+ overflow_add(cols, gridx); - ccols = ( cols + gridx - 1 ) / gridx; - bitrow = pbm_allocrow( cols ); - sig = (int*) pm_allocrow( ccols, sizeof(int) ); -+ overflow_add(ccols, 1); - line = (char*) pm_allocrow( ccols + 1, sizeof(char) ); - - for ( row = 0; row < rows; row += gridy ) -diff -up netpbm-10.35.46/converter/pbm/pbmtocmuwm.c.security netpbm-10.35.46/converter/pbm/pbmtocmuwm.c ---- netpbm-10.35.46/converter/pbm/pbmtocmuwm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtocmuwm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -43,6 +43,7 @@ main( argc, argv ) - bitrow = pbm_allocrow( cols ); - - /* Round cols up to the nearest multiple of 8. */ -+ overflow_add(cols, 7); - padright = ( ( cols + 7 ) / 8 ) * 8 - cols; - - putinit( rows, cols ); -diff -up netpbm-10.35.46/converter/pbm/pbmtogem.c.security netpbm-10.35.46/converter/pbm/pbmtogem.c ---- netpbm-10.35.46/converter/pbm/pbmtogem.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtogem.c 2008-06-24 09:04:21.000000000 +0200 -@@ -123,6 +123,7 @@ putinit (rows, cols) - bitsperitem = 0; - bitshift = 7; - outcol = 0; -+ overflow_add(cols, 7); - outmax = (cols + 7) / 8; - outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); - lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); -diff -up netpbm-10.35.46/converter/pbm/pbmtogo.c.security netpbm-10.35.46/converter/pbm/pbmtogo.c ---- netpbm-10.35.46/converter/pbm/pbmtogo.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtogo.c 2008-06-24 09:04:21.000000000 +0200 -@@ -96,6 +96,7 @@ main( argc, argv ) - bitrow = pbm_allocrow(cols); - - /* Round cols up to the nearest multiple of 8. */ -+ overflow_add(cols, 7); - rucols = ( cols + 7 ) / 8; - bytesperrow = rucols; /* GraphOn uses bytes */ - rucols = rucols * 8; -diff -up netpbm-10.35.46/converter/pbm/pbmtoicon.c.security netpbm-10.35.46/converter/pbm/pbmtoicon.c ---- netpbm-10.35.46/converter/pbm/pbmtoicon.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoicon.c 2008-06-24 09:04:21.000000000 +0200 -@@ -42,6 +42,7 @@ main( argc, argv ) - bitrow = pbm_allocrow( cols ); - - /* Round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 15); - pad = ( ( cols + 15 ) / 16 ) * 16 - cols; - padleft = pad / 2; - padright = pad - padleft; -diff -up netpbm-10.35.46/converter/pbm/pbmtolj.c.security netpbm-10.35.46/converter/pbm/pbmtolj.c ---- netpbm-10.35.46/converter/pbm/pbmtolj.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtolj.c 2008-06-24 09:04:21.000000000 +0200 -@@ -119,7 +119,11 @@ parseCommandLine(int argc, char ** argv, - static void - allocateBuffers(unsigned int const cols) { - -+ overflow_add(cols, 8); - rowBufferSize = (cols + 7) / 8; -+ overflow_add(rowBufferSize, 128); -+ overflow_add(rowBufferSize, rowBufferSize+128); -+ overflow_add(rowBufferSize+10, rowBufferSize/8); - packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; - deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; - -diff -up netpbm-10.35.46/converter/pbm/pbmtomacp.c.security netpbm-10.35.46/converter/pbm/pbmtomacp.c ---- netpbm-10.35.46/converter/pbm/pbmtomacp.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtomacp.c 2008-06-24 09:04:21.000000000 +0200 -@@ -104,6 +104,7 @@ char *argv[]; - if( !lflg ) - left = 0; - -+ overflow_add(left, MAX_COLS - 1); - if( rflg ) - { if( right - left >= MAX_COLS ) - right = left + MAX_COLS - 1; -@@ -114,6 +115,8 @@ char *argv[]; - if( !tflg ) - top = 0; - -+ overflow_add(top, MAX_LINES - 1); -+ - if( bflg ) - { if( bottom - top >= MAX_LINES ) - bottom = top + MAX_LINES - 1; -diff -up netpbm-10.35.46/converter/pbm/pbmtomda.c.security netpbm-10.35.46/converter/pbm/pbmtomda.c ---- netpbm-10.35.46/converter/pbm/pbmtomda.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtomda.c 2008-06-24 09:04:21.000000000 +0200 -@@ -179,6 +179,7 @@ int main(int argc, char **argv) - - nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; - -+ overflow_add(nOutRowsUnrounded, 3); - nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; - /* MDA wants rows a multiple of 4 */ - nOutCols = nInCols / 8; -diff -up netpbm-10.35.46/converter/pbm/pbmtomgr.c.security netpbm-10.35.46/converter/pbm/pbmtomgr.c ---- netpbm-10.35.46/converter/pbm/pbmtomgr.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtomgr.c 2008-06-24 09:04:21.000000000 +0200 -@@ -43,6 +43,7 @@ main( argc, argv ) - bitrow = pbm_allocrow( cols ); - - /* Round cols up to the nearest multiple of 8. */ -+ overflow_add(cols, 7); - padright = ( ( cols + 7 ) / 8 ) * 8 - cols; - - putinit( rows, cols ); -diff -up netpbm-10.35.46/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.35.46/converter/pbm/pbmtoppa/pbm.c ---- netpbm-10.35.46/converter/pbm/pbmtoppa/pbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoppa/pbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned - return 0; - - case P4: -+ overflow_add(pbm->width, 7); - tmp=(pbm->width+7)/8; - tmp2=fread(data,1,tmp,pbm->fptr); - if(tmp2 == tmp) -@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void - return; - - pbm->unread = 1; -- pbm->revdata = malloc ((pbm->width+7)/8); -+ overflow_add(pbm->width, 7); -+ pbm->revdata = malloc((pbm->width+7)/8); - memcpy (pbm->revdata, data, (pbm->width+7)/8); - pbm->current_line--; - } -diff -up netpbm-10.35.46/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.35.46/converter/pbm/pbmtoppa/pbmtoppa.c ---- netpbm-10.35.46/converter/pbm/pbmtoppa/pbmtoppa.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoppa/pbmtoppa.c 2008-06-24 09:04:21.000000000 +0200 -@@ -441,6 +441,7 @@ main(int argc, char *argv[]) { - pm_error("main(): unrecognized parameter '%s'", argv[argn]); - } - -+ overflow_add(Width, 7); - Pwidth=(Width+7)/8; - printer.fptr=out; - -diff -up netpbm-10.35.46/converter/pbm/pbmtox10bm.c.security netpbm-10.35.46/converter/pbm/pbmtox10bm.c ---- netpbm-10.35.46/converter/pbm/pbmtox10bm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtox10bm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -57,6 +57,7 @@ main(int argc, char * argv[]) { - bitrow = pbm_allocrow( cols ); - - /* Compute padding to round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 15); - padright = ( ( cols + 15 ) / 16 ) * 16 - cols; - - printf( "#define %s_width %d\n", name, cols ); -diff -up netpbm-10.35.46/converter/pbm/pbmtoxbm.c.security netpbm-10.35.46/converter/pbm/pbmtoxbm.c ---- netpbm-10.35.46/converter/pbm/pbmtoxbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoxbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -100,6 +100,7 @@ main(int argc, char * argv[]) { - bitrow = pbm_allocrow(cols); - - /* Compute padding to round cols up to the nearest multiple of 8. */ -+ overflow_add(cols, 8); - padright = ((cols + 7)/8) * 8 - cols; - - printf("#define %s_width %d\n", name, cols); -diff -up netpbm-10.35.46/converter/pbm/pbmtoybm.c.security netpbm-10.35.46/converter/pbm/pbmtoybm.c ---- netpbm-10.35.46/converter/pbm/pbmtoybm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtoybm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) - bitrow = pbm_allocrow( cols ); - - /* Compute padding to round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 16); - padright = ( ( cols + 15 ) / 16 ) * 16 - cols; - - putinit( cols, rows ); -diff -up netpbm-10.35.46/converter/pbm/pbmtozinc.c.security netpbm-10.35.46/converter/pbm/pbmtozinc.c ---- netpbm-10.35.46/converter/pbm/pbmtozinc.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pbmtozinc.c 2008-06-24 09:04:21.000000000 +0200 -@@ -65,6 +65,7 @@ main(int argc, char * argv[]) { - bitrow = pbm_allocrow( cols ); - - /* Compute padding to round cols up to the nearest multiple of 16. */ -+ overflow_add(cols, 16); - padright = ( ( cols + 15 ) / 16 ) * 16 - cols; - - printf( "USHORT %s[] = {\n",name); -diff -up netpbm-10.35.46/converter/pbm/pktopbm.c.security netpbm-10.35.46/converter/pbm/pktopbm.c ---- netpbm-10.35.46/converter/pbm/pktopbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/pktopbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -277,6 +277,7 @@ main(int argc, char *argv[]) { - if (flagbyte == 7) { /* long form preamble */ - integer packetlength = get32() ; /* character packet length */ - car = get32() ; /* character number */ -+ overflow_add(packetlength, pktopbm_pkloc); - endofpacket = packetlength + pktopbm_pkloc; - /* calculate end of packet */ - if ((car >= MAXPKCHAR) || !filename[car]) { -diff -up netpbm-10.35.46/converter/pbm/thinkjettopbm.l.security netpbm-10.35.46/converter/pbm/thinkjettopbm.l ---- netpbm-10.35.46/converter/pbm/thinkjettopbm.l.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/thinkjettopbm.l 2008-06-24 09:04:21.000000000 +0200 -@@ -106,7 +106,9 @@ DIG [0-9] - \033\*b{DIG}+W { - int l; - if (rowCount >= rowCapacity) { -+ overflow_add(rowCapacity, 100); - rowCapacity += 100; -+ overflow2(rowCapacity, sizeof *rows); - rows = realloc (rows, rowCapacity * sizeof *rows); - if (rows == NULL) - pm_error ("Out of memory."); -@@ -216,6 +218,8 @@ yywrap (void) - /* - * Quite simple since ThinkJet bit arrangement matches PBM - */ -+ -+ overflow2(maxRowLength, 8); - pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); - - packed_bitrow = malloc(maxRowLength); -diff -up netpbm-10.35.46/converter/pbm/ybmtopbm.c.security netpbm-10.35.46/converter/pbm/ybmtopbm.c ---- netpbm-10.35.46/converter/pbm/ybmtopbm.c.security 2008-06-24 08:59:23.000000000 +0200 -+++ netpbm-10.35.46/converter/pbm/ybmtopbm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad - pm_error( "EOF / read error" ); - - *depthP = 1; -+ overflow_add(*colsP, 15); - *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP; - bitsperitem = 0; - } -diff -up netpbm-10.35.46/converter/pgm/lispmtopgm.c.security netpbm-10.35.46/converter/pgm/lispmtopgm.c ---- netpbm-10.35.46/converter/pgm/lispmtopgm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/pgm/lispmtopgm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -58,6 +58,7 @@ main( argc, argv ) - pm_error( "depth (%d bits) is too large", depth); - - pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 ); -+ overflow_add(cols, 7); - grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 ); - - for ( row = 0; row < rows; ++row ) -@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad - - if ( *depthP == 0 ) - *depthP = 1; /* very old file */ -- -+ -+ overflow_add((int)colsP, 31); -+ - *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; - - if ( *colsP != (cols_32 - *padrightP) ) { -diff -up netpbm-10.35.46/converter/pgm/psidtopgm.c.security netpbm-10.35.46/converter/pgm/psidtopgm.c ---- netpbm-10.35.46/converter/pgm/psidtopgm.c.security 2008-06-24 08:59:13.000000000 +0200 -+++ netpbm-10.35.46/converter/pgm/psidtopgm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -78,6 +78,7 @@ main(int argc, - pm_error("bits/sample (%d) is too large.", bitspersample); - - pgm_writepgminit(stdout, cols, rows, maxval, 0); -+ overflow_add(cols, 7); - grayrow = pgm_allocrow((cols + 7) / 8 * 8); - for (row = 0; row < rows; ++row) { - unsigned int col; -diff -up netpbm-10.35.46/converter/ppm/ilbmtoppm.c.security netpbm-10.35.46/converter/ppm/ilbmtoppm.c ---- netpbm-10.35.46/converter/ppm/ilbmtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ilbmtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -595,6 +595,7 @@ decode_row(FILE * const ifP, - rawtype *chp; - - cols = bmhdP->w; -+ overflow_add(cols, 15); - bytes = RowBytes(cols); - for( plane = 0; plane < nPlanes; plane++ ) { - int mask; -@@ -682,6 +683,23 @@ decode_mask(FILE * const ifP, - Multipalette handling - ****************************************************************************/ - -+static void * -+xmalloc2(x, y) -+ int x; -+ int y; -+{ -+ void *mem; -+ -+ overflow2(x,y); -+ if( x * y == 0 ) -+ return NULL; -+ -+ mem = malloc2(x,y); -+ if( mem == NULL ) -+ pm_error("out of memory allocating %d bytes", x * y); -+ return mem; -+} -+ - - static void - multi_adjust(cmap, row, palchange) -@@ -1294,6 +1312,9 @@ dcol_to_ppm(FILE * const ifP, - if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) - pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); - -+ overflow_add(redmaxval, 1); -+ overflow_add(greenmaxval, 1); -+ overflow_add(bluemaxval, 1); - MALLOCARRAY_NOFAIL(redtable, redmaxval +1); - MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); - MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); -@@ -1725,7 +1746,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data - ChangeCount32 = *data++; - datasize -= 2; - -+ overflow_add(ChangeCount16, ChangeCount32); - changes = ChangeCount16 + ChangeCount32; -+ overflow_add(changes, 1); - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; - if( datasize < 2 ) goto fail; -@@ -1852,6 +1875,7 @@ PCHG_ConvertBig(PCHG, cmap, mask, datasi - if( datasize < 2 ) goto fail; - changes = BIG_WORD(data); data += 2; datasize -= 2; - -+ overflow_add(changes, 1); - MALLOCARRAY_NOFAIL(cmap->mp_change[row], changes + 1); - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; -@@ -1965,6 +1989,9 @@ read_pchg(FILE * const ifp, - cmap->mp_change[i] = NULL; - if( PCHG.StartLine < 0 ) { - int nch; -+ if(PCHG.MaxReg < PCHG.MinReg) -+ pm_error("assert: MinReg > MaxReg"); -+ overflow_add(PCHG.MaxReg-PCHG.MinReg, 2); - nch = PCHG.MaxReg - PCHG.MinReg +1; - MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); - for( i = 0; i < nch; i++ ) -@@ -2041,6 +2068,7 @@ process_body( FILE * const ifp, - if( typeid == ID_ILBM ) { - int isdeep; - -+ overflow_add(bmhdP->w, 15); - MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); - *viewportmodesP |= fakeviewport; /* -isham/-isehb */ - -diff -up netpbm-10.35.46/converter/ppm/imgtoppm.c.security netpbm-10.35.46/converter/ppm/imgtoppm.c ---- netpbm-10.35.46/converter/ppm/imgtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/imgtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -84,6 +84,7 @@ main(int argc, char ** argv) { - len = atoi((char*) buf ); - if ( fread( buf, len, 1, ifp ) != 1 ) - pm_error( "bad colormap buf" ); -+ overflow2(cmaplen, 3); - if ( cmaplen * 3 != len ) - { - pm_message( -@@ -105,6 +106,7 @@ main(int argc, char ** argv) { - pm_error( "bad pixel data header" ); - buf[8] = '\0'; - len = atoi((char*) buf ); -+ overflow2(cols, rows); - if ( len != cols * rows ) - pm_message( - "pixel data length (%d) does not match image size (%d)", -diff -up netpbm-10.35.46/converter/ppm/Makefile.security netpbm-10.35.46/converter/ppm/Makefile ---- netpbm-10.35.46/converter/ppm/Makefile.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/Makefile 2008-06-24 09:04:21.000000000 +0200 -@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg - - PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ - leaftoppm mtvtoppm neotoppm \ -- pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ -+ pcxtoppm pc1toppm pi1toppm pjtoppm \ - ppmtoacad ppmtoarbtxt \ - ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ - ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ -diff -up netpbm-10.35.46/converter/ppm/pcxtoppm.c.security netpbm-10.35.46/converter/ppm/pcxtoppm.c ---- netpbm-10.35.46/converter/ppm/pcxtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/pcxtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -408,6 +408,7 @@ pcx_planes_to_pixels(pixels, bitplanes, - /* - * clear the pixel buffer - */ -+ overflow2(bytesperline, 8); - npixels = (bytesperline * 8) / bitsperpixel; - p = pixels; - while (--npixels >= 0) -@@ -469,6 +470,7 @@ pcx_16col_to_ppm(FILE * const ifP, - } - - /* BytesPerLine should be >= BitsPerPixel * cols / 8 */ -+ overflow2(BytesPerLine, 8); - rawcols = BytesPerLine * 8 / BitsPerPixel; - if (headerCols > rawcols) { - pm_message("warning - BytesPerLine = %d, " -diff -up netpbm-10.35.46/converter/ppm/picttoppm.c.security netpbm-10.35.46/converter/ppm/picttoppm.c ---- netpbm-10.35.46/converter/ppm/picttoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/picttoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -1,3 +1,5 @@ -+#error "Unfixable. Don't ship me" -+ - /* - * picttoppm.c -- convert a MacIntosh PICT file to PPM format. - * -diff -up netpbm-10.35.46/converter/ppm/pjtoppm.c.security netpbm-10.35.46/converter/ppm/pjtoppm.c ---- netpbm-10.35.46/converter/ppm/pjtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/pjtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -127,19 +127,21 @@ main(argc, argv) - case 'V': /* send plane */ - case 'W': /* send last plane */ - if (rows == -1 || r >= rows || image == NULL) { -- if (rows == -1 || r >= rows) -+ if (rows == -1 || r >= rows) { -+ overflow_add(rows, 100); - rows += 100; -+ } - if (image == NULL) { -- MALLOCARRAY(image, rows * planes); -- MALLOCARRAY(imlen, rows * planes); -+ image = (unsigned char **) -+ malloc3(rows , planes , sizeof(unsigned char *)); -+ imlen = (int *) malloc3(rows , planes, sizeof(int)); - } - else { -+ overflow2(rows,planes); - image = (unsigned char **) -- realloc(image, -- rows * planes * -+ realloc2(image, rows * planes, - sizeof(unsigned char *)); -- imlen = (int *) -- realloc(imlen, rows * planes * sizeof(int)); -+ imlen = (int *) realloc2(imlen, rows * planes, sizeof(int)); - } - } - if (image == NULL || imlen == NULL) -@@ -212,8 +214,10 @@ main(argc, argv) - for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2) - for (cmd = image[p + r * planes][c], - val = image[p + r * planes][c+1]; -- cmd >= 0 && i < newcols; cmd--, i++) -+ cmd >= 0 && i < newcols; cmd--, i++) { - buf[i] = val; -+ overflow_add(i, 1); -+ } - cols = cols > i ? cols : i; - free(image[p + r * planes]); - /* -@@ -224,6 +228,7 @@ main(argc, argv) - image[p + r * planes] = (unsigned char *) realloc(buf, i); - } - } -+ overflow2(cols, 8); - cols *= 8; - } - -diff -up netpbm-10.35.46/converter/ppm/ppmtoeyuv.c.security netpbm-10.35.46/converter/ppm/ppmtoeyuv.c ---- netpbm-10.35.46/converter/ppm/ppmtoeyuv.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtoeyuv.c 2008-06-24 09:04:21.000000000 +0200 -@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva - - int index; - -+ overflow_add(maxval, 1); - MALLOCARRAY_NOFAIL(mult299 , maxval+1); - MALLOCARRAY_NOFAIL(mult587 , maxval+1); - MALLOCARRAY_NOFAIL(mult114 , maxval+1); -diff -up netpbm-10.35.46/converter/ppm/ppmtoicr.c.security netpbm-10.35.46/converter/ppm/ppmtoicr.c ---- netpbm-10.35.46/converter/ppm/ppmtoicr.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtoicr.c 2008-06-24 09:04:21.000000000 +0200 -@@ -169,7 +169,7 @@ char* argv[]; - - if (rleflag) { - pm_message("sending run-length encoded picture data ..." ); -- testimage = (char*) malloc(rows*cols); -+ testimage = (char*) malloc2(rows, cols); - p = testimage; - for (i=0; i>3) * sizeof(int32 *); - int xsz = (Fsize_x>>3); -- -+ -+ overflow2((Fsize_y>>3), sizeof(int32 *)); - needs_init = FALSE; - for (y=0; y<3; y++) { - varDiff[y] = ratio[y] = total[y] = 0.0; -@@ -787,6 +788,7 @@ BlockComputeSNR(MpegFrame * const curren - fprintf(stderr, "Out of memory in BlockComputeSNR\n"); - exit(-1); - } -+ overflow2(xsz,4); - for (y = 0; y < ySize[0]>>3; y++) { - SignalY[y] = (int32 *) calloc(xsz,4); - SignalCr[y] = (int32 *) calloc(xsz,4); -@@ -945,27 +947,27 @@ AllocDctBlocks(void) { - dctx = Fsize_x / DCTSIZE; - dcty = Fsize_y / DCTSIZE; - -- dct = (Block **) malloc(sizeof(Block *) * dcty); -+ dct = (Block **) malloc2(sizeof(Block *), dcty); - ERRCHK(dct, "malloc"); - for (i = 0; i < dcty; i++) { -- dct[i] = (Block *) malloc(sizeof(Block) * dctx); -+ dct[i] = (Block *) malloc2(sizeof(Block), dctx); - ERRCHK(dct[i], "malloc"); - } - -- dct_data = (dct_data_type **) malloc(sizeof(dct_data_type *) * dcty); -+ dct_data = (dct_data_type **) malloc2(sizeof(dct_data_type *), dcty); - ERRCHK(dct_data, "malloc"); - for (i = 0; i < dcty; i++) { -- dct_data[i] = (dct_data_type *) malloc(sizeof(dct_data_type) * dctx); -+ dct_data[i] = (dct_data_type *) malloc2(sizeof(dct_data_type), dctx); - ERRCHK(dct[i], "malloc"); - } - -- dctr = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -- dctb = (Block **) malloc(sizeof(Block *) * (dcty >> 1)); -+ dctr = (Block **) malloc2(sizeof(Block *), (dcty >> 1)); -+ dctb = (Block **) malloc2(sizeof(Block *), (dcty >> 1)); - ERRCHK(dctr, "malloc"); - ERRCHK(dctb, "malloc"); - for (i = 0; i < (dcty >> 1); i++) { -- dctr[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -- dctb[i] = (Block *) malloc(sizeof(Block) * (dctx >> 1)); -+ dctr[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); -+ dctb[i] = (Block *) malloc2(sizeof(Block), (dctx >> 1)); - ERRCHK(dctr[i], "malloc"); - ERRCHK(dctb[i], "malloc"); - } -diff -up netpbm-10.35.46/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.35.46/converter/ppm/ppmtompeg/parallel.c ---- netpbm-10.35.46/converter/ppm/ppmtompeg/parallel.c.security 2008-06-24 08:59:19.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtompeg/parallel.c 2008-06-24 09:04:21.000000000 +0200 -@@ -2161,7 +2161,9 @@ DecodeServer(int const numInput - const char * error; - - /* should keep list of port numbers to notify when frames become ready */ -- -+ -+ overflow2(numInputFiles, sizeof(int)); -+ overflow2(numInputFiles, sizeof(boolean)); - ready = (boolean *) calloc(numInputFiles, sizeof(boolean)); - waitMachine = (int *) calloc(numInputFiles, sizeof(int)); - waitPort = (int *) malloc(numMachines*sizeof(int)); -diff -up netpbm-10.35.46/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.35.46/converter/ppm/ppmtompeg/psearch.c ---- netpbm-10.35.46/converter/ppm/ppmtompeg/psearch.c.security 2008-06-24 08:59:19.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtompeg/psearch.c 2008-06-24 09:04:21.000000000 +0200 -@@ -214,7 +214,14 @@ SetSearchRange(int const pixelsP, int co - int const max_search = max(searchRangeP, searchRangeB); - - int index; -- -+ -+ overflow2(searchRangeP, 2); -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeP*2, 3); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(2*searchRangeB+3, sizeof(int)); -+ overflow2(2*searchRangeP+3, sizeof(int)); -+ - pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *)); - bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *)); - bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *)); -@@ -798,6 +805,9 @@ ShowPMVHistogram(fpointer) - int *columnTotals; - int rowTotal; - -+ overflow2(searchRangeP, 2); -+ overflow_add(searchRangeP*2, 3); -+ overflow2(searchRangeP*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY -@@ -845,6 +855,9 @@ ShowBBMVHistogram(fpointer) - - fprintf(fpointer, "B-frame Backwards:\n"); - -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(searchRangeB*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY -@@ -892,6 +905,9 @@ ShowBFMVHistogram(fpointer) - - fprintf(fpointer, "B-frame Forwards:\n"); - -+ overflow2(searchRangeB, 2); -+ overflow_add(searchRangeB*2, 3); -+ overflow2(searchRangeB*2+3, sizeof(int)); - columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); - - #ifdef COMPLETE_DISPLAY -diff -up netpbm-10.35.46/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.35.46/converter/ppm/ppmtompeg/rgbtoycc.c ---- netpbm-10.35.46/converter/ppm/ppmtompeg/rgbtoycc.c.security 2008-06-24 08:59:19.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtompeg/rgbtoycc.c 2008-06-24 09:04:21.000000000 +0200 -@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval) - } - table_maxval = maxval; - -+ overflow_add(table_maxval, 1); -+ overflow2(table_maxval+1, sizeof(float)); - mult299 = malloc((table_maxval+1)*sizeof(float)); - mult587 = malloc((table_maxval+1)*sizeof(float)); - mult114 = malloc((table_maxval+1)*sizeof(float)); -diff -up netpbm-10.35.46/converter/ppm/ppmtopcx.c.security netpbm-10.35.46/converter/ppm/ppmtopcx.c ---- netpbm-10.35.46/converter/ppm/ppmtopcx.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtopcx.c 2008-06-24 09:04:21.000000000 +0200 -@@ -418,6 +418,8 @@ ppmTo16ColorPcx(pixel ** cons - else Planes = 1; - } - } -+ overflow2(BitsPerPixel, cols); -+ overflow_add(BitsPerPixel * cols, 7); - BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; - MALLOCARRAY_NOFAIL(indexRow, cols); - MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); -diff -up netpbm-10.35.46/converter/ppm/ppmtopict.c.security netpbm-10.35.46/converter/ppm/ppmtopict.c ---- netpbm-10.35.46/converter/ppm/ppmtopict.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtopict.c 2008-06-24 09:04:21.000000000 +0200 -@@ -245,6 +245,8 @@ char *argv[]; - putShort(stdout, 0); /* mode */ - - /* Finally, write out the data. */ -+ overflow_add(cols/MAX_COUNT, 1); -+ overflow_add(cols, cols/MAX_COUNT+1); - packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1)); - oc = 0; - for (row = 0; row < rows; row++) -diff -up netpbm-10.35.46/converter/ppm/ppmtopj.c.security netpbm-10.35.46/converter/ppm/ppmtopj.c ---- netpbm-10.35.46/converter/ppm/ppmtopj.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtopj.c 2008-06-24 09:04:21.000000000 +0200 -@@ -179,6 +179,7 @@ char *argv[]; - pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); - - pm_close( ifp ); -+ overflow2(cols,2); - obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); - cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); - -diff -up netpbm-10.35.46/converter/ppm/ppmtopjxl.c.security netpbm-10.35.46/converter/ppm/ppmtopjxl.c ---- netpbm-10.35.46/converter/ppm/ppmtopjxl.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtopjxl.c 2008-06-24 09:04:21.000000000 +0200 -@@ -274,6 +274,8 @@ main(argc, argv) - pm_error("image too large; reduce with ppmscale"); - if (maxval > PCL_MAXVAL) - pm_error("color range too large; reduce with ppmcscale"); -+ if (cols < 0 || rows < 0) -+ pm_error("negative size is not possible"); - - /* Figure out the colormap. */ - fprintf( stderr, "(Computing colormap..." ); fflush( stderr ); -@@ -294,6 +296,8 @@ main(argc, argv) - case 0: /* direct mode (no palette) */ - bpp = bitsperpixel(maxval); /* bits per pixel */ - bpg = bpp; bpb = bpp; -+ overflow2(bpp, 3); -+ overflow_add(bpp*3, 7); - bpp = (bpp*3+7)>>3; /* bytes per pixel now */ - bpr = (bpp<<3)-bpg-bpb; - bpp *= cols; /* bytes per row now */ -@@ -303,9 +307,13 @@ main(argc, argv) - case 3: case 7: pclindex++; - default: - bpp = 8/pclindex; -+ overflow_add(cols, bpp); -+ if(bpp == 0) -+ pm_error("assert: no bpp"); - bpp = (cols+bpp-1)/bpp; /* bytes per row */ - } - -+ overflow2(bpp,2); - if ((inrow = (char *)malloc((unsigned)bpp)) == NULL || - (outrow = (char *)malloc((unsigned)bpp*2)) == NULL || - (runcnt = (signed char *)malloc((unsigned)bpp)) == NULL) -diff -up netpbm-10.35.46/converter/ppm/ppmtowinicon.c.security netpbm-10.35.46/converter/ppm/ppmtowinicon.c ---- netpbm-10.35.46/converter/ppm/ppmtowinicon.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtowinicon.c 2008-06-24 09:04:21.000000000 +0200 -@@ -12,6 +12,7 @@ - - #include - #include -+#include - - #include "winico.h" - #include "ppm.h" -@@ -218,6 +219,7 @@ createAndBitmap (gray ** const ba, int c - MALLOCARRAY_NOFAIL(rowData, rows); - icBitmap->xBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - for (y=0;yxBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - - for (y=0;yxBytes = xBytes; - icBitmap->data = rowData; -+ overflow2(xBytes, rows); - icBitmap->size = xBytes * rows; - - for (y=0;ybitcount = bpp; - entry->ih = createInfoHeader(entry, xorBitmap, andBitmap); - entry->colors = palette->colors; -+ overflow2(4, entry->color_count); -+ overflow_add(xorBitmap->size, andBitmap->size); -+ overflow_add(xorBitmap->size + andBitmap->size, 40); -+ overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count); - entry->size_in_bytes = - xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); - if (verbose) -diff -up netpbm-10.35.46/converter/ppm/ppmtoxpm.c.security netpbm-10.35.46/converter/ppm/ppmtoxpm.c ---- netpbm-10.35.46/converter/ppm/ppmtoxpm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ppmtoxpm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -195,6 +195,7 @@ genNumstr(unsigned int const input, int - unsigned int i; - - /* Allocate memory for printed number. Abort if error. */ -+ overflow_add(digits, 1); - if (!(str = (char *) malloc(digits + 1))) - pm_error("out of memory"); - -@@ -312,6 +313,7 @@ genCmap(colorhist_vector const chv, - unsigned int charsPerPixel; - unsigned int xpmMaxval; - -+ if (includeTransparent) overflow_add(ncolors, 1); - MALLOCARRAY(cmap, cmapSize); - if (cmapP == NULL) - pm_error("Out of memory allocating %u bytes for a color map.", -diff -up netpbm-10.35.46/converter/ppm/qrttoppm.c.security netpbm-10.35.46/converter/ppm/qrttoppm.c ---- netpbm-10.35.46/converter/ppm/qrttoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/qrttoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -46,7 +46,7 @@ main( argc, argv ) - - ppm_writeppminit( stdout, cols, rows, maxval, 0 ); - pixelrow = ppm_allocrow( cols ); -- buf = (unsigned char *) malloc( 3 * cols ); -+ buf = (unsigned char *) malloc2( 3 , cols ); - if ( buf == (unsigned char *) 0 ) - pm_error( "out of memory" ); - -diff -up netpbm-10.35.46/converter/ppm/sldtoppm.c.security netpbm-10.35.46/converter/ppm/sldtoppm.c ---- netpbm-10.35.46/converter/ppm/sldtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/sldtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -306,7 +306,9 @@ static void slider(slvec, slflood) - } - - /* Allocate image buffer and clear it to black. */ -- -+ -+ overflow_add(ixdots,1); -+ overflow_add(iydots,1); - pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); - PPM_ASSIGN(rgbcolor, 0, 0, 0); - ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, -diff -up netpbm-10.35.46/converter/ppm/ximtoppm.c.security netpbm-10.35.46/converter/ppm/ximtoppm.c ---- netpbm-10.35.46/converter/ppm/ximtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/ximtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -111,6 +111,7 @@ ReadXimHeader(FILE * const in_fp, - header->bits_channel = atoi(a_head.bits_per_channel); - header->alpha_flag = atoi(a_head.alpha_channel); - if (strlen(a_head.author)) { -+ overflow_add(strlen(a_head.author),1); - if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1, - 1))) { - pm_message("ReadXimHeader: can't calloc author string" ); -@@ -120,6 +121,7 @@ ReadXimHeader(FILE * const in_fp, - strncpy(header->author, a_head.author, strlen(a_head.author)); - } - if (strlen(a_head.date)) { -+ overflow_add(strlen(a_head.date),1); - if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){ - pm_message("ReadXimHeader: can't calloc date string" ); - return(0); -@@ -128,6 +130,7 @@ ReadXimHeader(FILE * const in_fp, - strncpy(header->date, a_head.date, strlen(a_head.date)); - } - if (strlen(a_head.program)) { -+ overflow_add(strlen(a_head.program),1); - if (!(header->program = calloc( - (unsigned int)strlen(a_head.program) + 1, 1))) { - pm_message("ReadXimHeader: can't calloc program string" ); -@@ -154,6 +157,7 @@ ReadXimHeader(FILE * const in_fp, - if (header->nchannels == 3 && header->bits_channel == 8) - header->ncolors = 0; - else if (header->nchannels == 1 && header->bits_channel == 8) { -+ overflow2(header->ncolors, sizeof(Color)); - header->colors = (Color *)calloc((unsigned int)header->ncolors, - sizeof(Color)); - if (header->colors == NULL) { -diff -up netpbm-10.35.46/converter/ppm/xpmtoppm.c.security netpbm-10.35.46/converter/ppm/xpmtoppm.c ---- netpbm-10.35.46/converter/ppm/xpmtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/xpmtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -700,6 +700,7 @@ ReadXPMFile(FILE * const stream, int * c - &ncolors, colorsP, &ptab); - *transparentP = -1; /* No transparency in version 1 */ - } -+ overflow2(*widthP, *heightP); - totalpixels = *widthP * *heightP; - MALLOCARRAY(*dataP, totalpixels); - if (*dataP == NULL) -diff -up netpbm-10.35.46/converter/ppm/yuvtoppm.c.security netpbm-10.35.46/converter/ppm/yuvtoppm.c ---- netpbm-10.35.46/converter/ppm/yuvtoppm.c.security 2008-06-24 08:59:20.000000000 +0200 -+++ netpbm-10.35.46/converter/ppm/yuvtoppm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -72,6 +72,7 @@ main(argc, argv) - - ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); - pixrow = ppm_allocrow(cols); -+ overflow_add(cols, 1); - MALLOCARRAY(yuvbuf, (cols+1)/2); - if (yuvbuf == NULL) - pm_error("Unable to allocate YUV buffer for %d columns.", cols); -diff -up netpbm-10.35.46/editor/pamcut.c.security netpbm-10.35.46/editor/pamcut.c ---- netpbm-10.35.46/editor/pamcut.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pamcut.c 2008-06-24 09:04:21.000000000 +0200 -@@ -514,6 +514,8 @@ cutOneImage(FILE * const ifP - outpam.width = rightcol-leftcol+1; - outpam.height = bottomrow-toprow+1; - -+ overflow_add(rightcol, 1); -+ overflow_add(toprow, 1); - pnm_writepaminit(&outpam); - - /* Write out top padding */ -diff -up netpbm-10.35.46/editor/pamoil.c.security netpbm-10.35.46/editor/pamoil.c ---- netpbm-10.35.46/editor/pamoil.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pamoil.c 2008-06-24 09:04:21.000000000 +0200 -@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { - tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); - pm_close(ifp); - -+ overflow_add(inpam.maxval, 1); - MALLOCARRAY(hist, inpam.maxval + 1); - if (hist == NULL) - pm_error("Unable to allocate memory for histogram."); -diff -up netpbm-10.35.46/editor/pbmpscale.c.security netpbm-10.35.46/editor/pbmpscale.c ---- netpbm-10.35.46/editor/pbmpscale.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pbmpscale.c 2008-06-24 09:04:21.000000000 +0200 -@@ -109,6 +109,7 @@ main(argc, argv) - inrow[0] = inrow[1] = inrow[2] = NULL; - pbm_readpbminit(ifd, &columns, &rows, &format) ; - -+ overflow2(columns, scale); - outrow = pbm_allocrow(columns*scale) ; - MALLOCARRAY(flags, columns); - if (flags == NULL) -diff -up netpbm-10.35.46/editor/pbmreduce.c.security netpbm-10.35.46/editor/pbmreduce.c ---- netpbm-10.35.46/editor/pbmreduce.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pbmreduce.c 2008-06-24 09:04:21.000000000 +0200 -@@ -93,6 +93,7 @@ main( argc, argv ) - - if ( halftone == QT_FS ) { - /* Initialize Floyd-Steinberg. */ -+ overflow_add(newcols, 2); - MALLOCARRAY(thiserr, newcols + 2); - MALLOCARRAY(nexterr, newcols + 2); - if ( thiserr == NULL || nexterr == NULL ) -diff -up netpbm-10.35.46/editor/pnmcut.c.security netpbm-10.35.46/editor/pnmcut.c ---- netpbm-10.35.46/editor/pnmcut.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmcut.c 2008-06-24 09:04:21.000000000 +0200 -@@ -373,6 +373,7 @@ main(int argc, char *argv[]) { - toprow, leftcol, bottomrow, rightcol); - } - -+ overflow_add(rightcol, 1); - output_cols = rightcol-leftcol+1; - output_row = pnm_allocrow(output_cols); - -diff -up netpbm-10.35.46/editor/pnmgamma.c.security netpbm-10.35.46/editor/pnmgamma.c ---- netpbm-10.35.46/editor/pnmgamma.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmgamma.c 2008-06-24 09:04:21.000000000 +0200 -@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction - xelval ** const btableP) { - - /* Allocate space for the tables. */ -+ overflow_add(maxval, 1); - MALLOCARRAY(*rtableP, maxval+1); - MALLOCARRAY(*gtableP, maxval+1); - MALLOCARRAY(*btableP, maxval+1); -diff -up netpbm-10.35.46/editor/pnmhisteq.c.security netpbm-10.35.46/editor/pnmhisteq.c ---- netpbm-10.35.46/editor/pnmhisteq.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmhisteq.c 2008-06-24 09:04:21.000000000 +0200 -@@ -102,6 +102,7 @@ computeLuminosityHistogram(xel * const * - unsigned int pixelCount; - unsigned int * lumahist; - -+ overflow_add(maxval, 1); - MALLOCARRAY(lumahist, maxval + 1); - if (lumahist == NULL) - pm_error("Out of storage allocating array for %u histogram elements", -diff -up netpbm-10.35.46/editor/pnmindex.csh.security netpbm-10.35.46/editor/pnmindex.csh ---- netpbm-10.35.46/editor/pnmindex.csh.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmindex.csh 2008-06-24 09:04:21.000000000 +0200 -@@ -1,5 +1,8 @@ - #!/bin/csh -f - # -+echo "Unsafe code, needs debugging, do not ship" -+exit 1 -+# - # pnmindex - build a visual index of a bunch of anymaps - # - # Copyright (C) 1991 by Jef Poskanzer. -diff -up netpbm-10.35.46/editor/pnmpad.c.security netpbm-10.35.46/editor/pnmpad.c ---- netpbm-10.35.46/editor/pnmpad.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmpad.c 2008-06-24 09:04:21.000000000 +0200 -@@ -358,6 +358,8 @@ main(int argc, char ** argv) { - - computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); - -+ overflow_add(cols, lpad); -+ overflow_add(cols + lpad, rpad); - newcols = cols + lpad + rpad; - xelrow = pnm_allocrow(newcols); - bgrow = pnm_allocrow(newcols); -diff -up netpbm-10.35.46/editor/pnmpaste.c.security netpbm-10.35.46/editor/pnmpaste.c ---- netpbm-10.35.46/editor/pnmpaste.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmpaste.c 2008-06-24 09:04:21.000000000 +0200 -@@ -101,11 +101,16 @@ main( argc, argv ) - "y is too large -- the second anymap has only %d rows", - rows2 ); - -+ overflow_add(x, cols2); -+ overflow_add(y, rows2); - if ( x < 0 ) - x += cols2; - if ( y < 0 ) - y += rows2; - -+ overflow_add(x, cols1); -+ overflow_add(y, rows1); -+ - if ( x + cols1 > cols2 ) - pm_error( "x + width is too large by %d pixels", x + cols1 - cols2 ); - if ( y + rows1 > rows2 ) -diff -up netpbm-10.35.46/editor/pnmremap.c.security netpbm-10.35.46/editor/pnmremap.c ---- netpbm-10.35.46/editor/pnmremap.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmremap.c 2008-06-24 09:04:21.000000000 +0200 -@@ -279,6 +279,7 @@ initFserr(struct pam * const pamP, - - unsigned int const fserrSize = pamP->width + 2; - -+ overflow_add(pamP->width, 2); - MALLOCARRAY(fserrP->thiserr, pamP->depth); - if (fserrP->thiserr == NULL) - pm_error("Out of memory allocating Floyd-Steinberg structures " -@@ -322,6 +323,7 @@ floydInitRow(struct pam * const pamP, st - - int col; - -+ overflow_add(pamP->width, 2); - for (col = 0; col < pamP->width + 2; ++col) { - unsigned int plane; - for (plane = 0; plane < pamP->depth; ++plane) -diff -up netpbm-10.35.46/editor/pnmscalefixed.c.security netpbm-10.35.46/editor/pnmscalefixed.c ---- netpbm-10.35.46/editor/pnmscalefixed.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmscalefixed.c 2008-06-24 09:04:21.000000000 +0200 -@@ -209,6 +209,8 @@ compute_output_dimensions(const struct c - const int rows, const int cols, - int * newrowsP, int * newcolsP) { - -+ overflow2(rows, cols); -+ - if (cmdline.pixels) { - if (rows * cols <= cmdline.pixels) { - *newrowsP = rows; -@@ -260,6 +262,8 @@ compute_output_dimensions(const struct c - - if (*newcolsP < 1) *newcolsP = 1; - if (*newrowsP < 1) *newrowsP = 1; -+ -+ overflow2(*newcolsP, *newrowsP); - } - - -@@ -441,6 +445,9 @@ main(int argc, char **argv ) { - unfilled. We can address that by stretching, whereas the other - case would require throwing away some of the input. - */ -+ -+ overflow2(newcols, SCALE); -+ overflow2(newrows, SCALE); - sxscale = SCALE * newcols / cols; - syscale = SCALE * newrows / rows; - -diff -up netpbm-10.35.46/editor/pnmshear.c.security netpbm-10.35.46/editor/pnmshear.c ---- netpbm-10.35.46/editor/pnmshear.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/pnmshear.c 2008-06-24 09:04:21.000000000 +0200 -@@ -14,6 +14,7 @@ - - #include - #include -+#include - - #include "pnm.h" - #include "shhopt.h" -@@ -196,6 +197,11 @@ main(int argc, char * argv[]) { - if ( shearfac < 0.0 ) - shearfac = -shearfac; - -+ if(rows * shearfac >= INT_MAX-1) -+ pm_error("image too large"); -+ -+ overflow_add(rows * shearfac, cols+1); -+ - newcols = rows * shearfac + cols + 0.999999; - - pnm_writepnminit( stdout, newcols, rows, newmaxval, newformat, 0 ); -diff -up netpbm-10.35.46/editor/ppmdither.c.security netpbm-10.35.46/editor/ppmdither.c ---- netpbm-10.35.46/editor/ppmdither.c.security 2008-06-24 08:58:59.000000000 +0200 -+++ netpbm-10.35.46/editor/ppmdither.c 2008-06-24 09:04:21.000000000 +0200 -@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim) - (dith_dim * sizeof(int *)) + /* pointers */ - (dith_dim * dith_dim * sizeof(int)); /* data */ - -+ overflow2(dith_dim, sizeof(int *)); -+ overflow3(dith_dim, dith_dim, sizeof(int)); -+ overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int)); - dith_mat = (unsigned int **) malloc(dith_mat_sz); - - if (dith_mat == NULL) -@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power - if (dith_nb < 2) - pm_error("too few shades for blue, minimum of 2"); - -- MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb); -+ overflow2(dith_nr, dith_ng); -+ *colormapP = malloc3(dith_nr * dith_ng, dith_nb, sizeof(pixel)); - if (*colormapP == NULL) - pm_error("Unable to allocate space for the color lookup table " - "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb); -diff -up netpbm-10.35.46/generator/pbmpage.c.security netpbm-10.35.46/generator/pbmpage.c ---- netpbm-10.35.46/generator/pbmpage.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/generator/pbmpage.c 2008-06-24 09:04:21.000000000 +0200 -@@ -170,6 +170,9 @@ outputPbm(FILE * const file, - /* We round the allocated row space up to a multiple of 8 so the ugly - fast code below can work. - */ -+ -+ overflow_add(bitmap.Width, 7); -+ - pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8); - - bitmap_cursor = 0; -diff -up netpbm-10.35.46/generator/pbmtext.c.security netpbm-10.35.46/generator/pbmtext.c ---- netpbm-10.35.46/generator/pbmtext.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/generator/pbmtext.c 2008-06-24 09:05:49.000000000 +0200 -@@ -89,12 +89,14 @@ parse_command_line(int argc, char ** arg - - for (i = 1; i < argc; i++) { - if (i > 1) { -+ overflow_add(totaltextsize, 1); - totaltextsize += 1; - text = realloc(text, totaltextsize); - if (text == NULL) - pm_error("out of memory allocating space for input text"); - strcat(text, " "); - } -+ overflow_add(totaltextsize, strlen(argv[i])); - totaltextsize += strlen(argv[i]); - text = realloc(text, totaltextsize); - if (text == NULL) -@@ -575,6 +577,7 @@ getText(const char cmdline_text - struct text input_text; - - if (cmdline_text) { -+ overflow_add(strlen(cmdline_text), 1); - allocTextArray(&input_text, 1, strlen(cmdline_text)*8); - strcpy(input_text.textArray[0], cmdline_text); - fix_control_chars(input_text.textArray[0], fn); -@@ -600,7 +603,9 @@ getText(const char cmdline_text - "Cannot process.", (sizeof(buf)-1)/8); - fix_control_chars(buf, fn); - if (lineCount >= maxlines) { -+ overflow2(maxlines, 2); - maxlines *= 2; -+ overflow2(maxlines, sizeof(char *)); - text_array = (char**) realloc((char*) text_array, - maxlines * sizeof(char*)); - if (text_array == NULL) -@@ -686,6 +691,7 @@ main(int argc, char *argv[]) { - hmargin = fontP->maxwidth; - } else { - vmargin = fontP->maxheight; -+ overflow2(2, fontP->maxwidth); - hmargin = 2 * fontP->maxwidth; - } - } -@@ -702,6 +708,12 @@ main(int argc, char *argv[]) { - } else - formattedText = inputText; - -+ overflow2(2, vmargin); -+ overflow2(formattedText.lineCount, fontP->maxheight); -+ overflow2(formattedText.lineCount-1, cmdline.lspace); -+ overflow_add(vmargin * 2, formattedText.lineCount * fontP->maxheight); -+ overflow_add(vmargin * 2 + formattedText.lineCount * fontP->maxheight, (formattedText.lineCount-1) * cmdline.lspace); -+ - rows = 2 * vmargin + - formattedText.lineCount * fontP->maxheight + - (formattedText.lineCount-1) * cmdline.lspace; -@@ -709,6 +721,9 @@ main(int argc, char *argv[]) { - compute_image_width(formattedText, fontP, cmdline.space, - &maxwidth, &maxleftb); - -+ overflow2(2, hmargin); -+ overflow_add(2*hmargin, maxwidth); -+ - cols = 2 * hmargin + maxwidth; - - if (cols == 0 || rows == 0) -diff -up netpbm-10.35.46/generator/pgmcrater.c.security netpbm-10.35.46/generator/pgmcrater.c ---- netpbm-10.35.46/generator/pgmcrater.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/generator/pgmcrater.c 2008-06-24 09:04:21.000000000 +0200 -@@ -131,7 +131,7 @@ static void gencraters() - /* Acquire the elevation array and initialize it to mean - surface elevation. */ - -- MALLOCARRAY(aux, SCRX * SCRY); -+ aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short)); - if (aux == NULL) - pm_error("out of memory allocating elevation array"); - -diff -up netpbm-10.35.46/generator/pgmkernel.c.security netpbm-10.35.46/generator/pgmkernel.c ---- netpbm-10.35.46/generator/pgmkernel.c.security 2008-06-24 08:58:57.000000000 +0200 -+++ netpbm-10.35.46/generator/pgmkernel.c 2008-06-24 09:04:21.000000000 +0200 -@@ -68,7 +68,7 @@ main ( argc, argv ) - kycenter = (fysize - 1) / 2.0; - ixsize = fxsize + 0.999; - iysize = fysize + 0.999; -- MALLOCARRAY(fkernel, ixsize * iysize); -+ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double)); - for (i = 0; i < iysize; i++) - for (j = 0; j < ixsize; j++) { - fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) -diff -up netpbm-10.35.46/lib/libpam.c.security netpbm-10.35.46/lib/libpam.c ---- netpbm-10.35.46/lib/libpam.c.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/libpam.c 2008-06-24 09:04:21.000000000 +0200 -@@ -236,7 +236,8 @@ allocPamRow(const struct pam * const pam - int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); - tuple * tuplerow; - -- tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple)); -+ overflow_add(sizeof(tuple *), bytesPerTuple); -+ tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple); - - if (tuplerow != NULL) { - /* Now we initialize the pointers to the individual tuples -diff -up netpbm-10.35.46/lib/libpammap.c.security netpbm-10.35.46/lib/libpammap.c ---- netpbm-10.35.46/lib/libpammap.c.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/libpammap.c 2008-06-24 09:04:21.000000000 +0200 -@@ -102,6 +102,8 @@ allocTupleIntListItem(struct pam * const - */ - struct tupleint_list_item * retval; - -+ overflow2(pamP->depth, sizeof(sample)); -+ overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample)); - unsigned int const size = - sizeof(*retval) - sizeof(retval->tupleint.tuple) - + pamP->depth * sizeof(sample); -diff -up netpbm-10.35.46/lib/libpbm1.c.security netpbm-10.35.46/lib/libpbm1.c ---- netpbm-10.35.46/lib/libpbm1.c.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/libpbm1.c 2008-06-24 09:04:21.000000000 +0200 -@@ -56,6 +56,7 @@ pbm_check(FILE * file, const enum pm_che - pm_message("pm_filepos passed to pm_check() is %u bytes", - sizeof(pm_filepos)); - #endif -+ overflow2(bytes_per_row, rows); - pm_check(file, check_type, need_raster_size, retval_p); - } - } -diff -up netpbm-10.35.46/lib/libpbmvms.c.security netpbm-10.35.46/lib/libpbmvms.c ---- netpbm-10.35.46/lib/libpbmvms.c.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/libpbmvms.c 2008-06-24 09:04:21.000000000 +0200 -@@ -1,3 +1,5 @@ -+#warning "NOT AUDITED" -+ - /*************************************************************************** - This file contains library routines needed to build Netpbm for VMS. - However, as of 2000.05.26, when these were split out of libpbm1.c -diff -up netpbm-10.35.46/lib/libpm.c.security netpbm-10.35.46/lib/libpm.c ---- netpbm-10.35.46/lib/libpm.c.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/libpm.c 2008-06-24 09:04:21.000000000 +0200 -@@ -36,6 +36,7 @@ - /* This makes the the x64() functions available on AIX */ - - #include -+#include - #include - #include - #include -@@ -213,7 +214,7 @@ pm_allocarray(int const cols, int const - if (rowIndex == NULL) - pm_error("out of memory allocating row index (%u rows) for an array", - rows); -- rowheap = malloc(rows * cols * size); -+ rowheap = malloc3(rows, cols, size); - if (rowheap == NULL) { - /* We couldn't get the whole heap in one block, so try fragmented - format. -@@ -1491,4 +1492,53 @@ pm_check(FILE * const file - } - - -+/* -+ * Maths wrapping -+ */ -+ -+void __overflow2(int a, int b) -+{ -+ if(a < 0 || b < 0) -+ pm_error("object too large"); -+ if(b == 0) -+ return; -+ if(a > INT_MAX / b) -+ pm_error("object too large"); -+} -+ -+void overflow3(int a, int b, int c) -+{ -+ overflow2(a,b); -+ overflow2(a*b, c); -+} -+ -+void overflow_add(int a, int b) -+{ -+ if( a > INT_MAX - b) -+ pm_error("object too large"); -+} -+ -+void *malloc2(int a, int b) -+{ -+ overflow2(a, b); -+ if(a*b == 0) -+ pm_error("Zero byte allocation"); -+ return malloc(a*b); -+} -+ -+void *malloc3(int a, int b, int c) -+{ -+ overflow3(a, b, c); -+ if(a*b*c == 0) -+ pm_error("Zero byte allocation"); -+ return malloc(a*b*c); -+} -+ -+void *realloc2(void * a, int b, int c) -+{ -+ overflow2(b, c); -+ if(b*c == 0) -+ pm_error("Zero byte allocation"); -+ return realloc(a, b*c); -+} - -diff -up netpbm-10.35.46/lib/pm.h.security netpbm-10.35.46/lib/pm.h ---- netpbm-10.35.46/lib/pm.h.security 2008-06-24 08:59:03.000000000 +0200 -+++ netpbm-10.35.46/lib/pm.h 2008-06-24 09:04:21.000000000 +0200 -@@ -343,4 +343,11 @@ pm_arg0toprogname(const char arg0[]); - #endif - - -+void *malloc2(int, int); -+void *malloc3(int, int, int); -+#define overflow2(a,b) __overflow2(a,b) -+void __overflow2(int, int); -+void overflow3(int, int, int); -+void overflow_add(int, int); -+ - #endif -diff -up netpbm-10.35.46/other/pnmcolormap.c.security netpbm-10.35.46/other/pnmcolormap.c ---- netpbm-10.35.46/other/pnmcolormap.c.security 2008-06-24 08:58:56.000000000 +0200 -+++ netpbm-10.35.46/other/pnmcolormap.c 2008-06-24 09:04:21.000000000 +0200 -@@ -839,6 +839,7 @@ colormapToSquare(struct pam * const pamP - pamP->width = intsqrt; - else - pamP->width = intsqrt + 1; -+ overflow_add(intsqrt, 1); - } - { - unsigned int const intQuotient = colormap.size / pamP->width; -diff -up netpbm-10.35.46/urt/README.security netpbm-10.35.46/urt/README ---- netpbm-10.35.46/urt/README.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/README 2008-06-24 09:04:21.000000000 +0200 -@@ -18,3 +18,8 @@ in its initializer in the original. But - defines stdout as a variable, so that wouldn't compile. So I changed - it to NULL and added a line to rle_hdr_init to set that field to - 'stdout' dynamically. 2000.06.02 BJH. -+ -+Redid the code to check for maths overflows and other crawly horrors. -+Removed pipe through and compress support (unsafe) -+ -+Alan Cox -diff -up netpbm-10.35.46/urt/rle_addhist.c.security netpbm-10.35.46/urt/rle_addhist.c ---- netpbm-10.35.46/urt/rle_addhist.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle_addhist.c 2008-06-24 09:04:21.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rle_addhist.c - Add to the HISTORY comment in header -@@ -76,13 +78,19 @@ rle_addhist(char * argv[], - return; - - length = 0; -- for (i = 0; argv[i]; ++i) -+ for (i = 0; argv[i]; ++i) { -+ overflow_add(length, strlen(argv[i])); -+ overflow_add(length+1, strlen(argv[i])); - length += strlen(argv[i]) +1; /* length of each arg plus space. */ -+ } - - time(&temp); - timedate = ctime(&temp); - length += strlen(timedate); /* length of date and time in ASCII. */ - -+ overflow_add(strlen(padding), 4); -+ overflow_add(strlen(histoire), strlen(padding) + 4); -+ overflow_add(length, strlen(histoire) + strlen(padding) + 4); - length += strlen(padding) + 3 + strlen(histoire) + 1; - /* length of padding, "on " and length of history name plus "="*/ - if (in_hdr) /* if we are interested in the old comments... */ -@@ -90,9 +98,12 @@ rle_addhist(char * argv[], - else - old = NULL; - -- if (old && *old) -+ if (old && *old) { -+ overflow_add(length, strlen(old)); - length += strlen(old); /* add length if there. */ -+ } - -+ overflow_add(length, 1); - ++length; /*Cater for the null. */ - - MALLOCARRAY(newc, length); -diff -up netpbm-10.35.46/urt/rle_getrow.c.security netpbm-10.35.46/urt/rle_getrow.c ---- netpbm-10.35.46/urt/rle_getrow.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle_getrow.c 2008-06-24 09:04:21.000000000 +0200 -@@ -17,6 +17,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rle_getrow.c - Read an RLE file in. -@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) { - register char * cp; - - VAXSHORT( comlen, infile ); /* get comment length */ -+ overflow_add(comlen, 1); - evenlen = (comlen + 1) & ~1; /* make it even */ - if ( evenlen ) - { -diff -up netpbm-10.35.46/urt/rle_hdr.c.security netpbm-10.35.46/urt/rle_hdr.c ---- netpbm-10.35.46/urt/rle_hdr.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle_hdr.c 2008-06-24 09:04:21.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rle_hdr.c - Functions to manipulate rle_hdr structures. -@@ -79,7 +81,10 @@ int img_num; - /* Fill in with copies of the strings. */ - if ( the_hdr->cmd != pgmname ) - { -- char *tmp = (char *)malloc( strlen( pgmname ) + 1 ); -+ char *tmp ; -+ -+ overflow_add(strlen(pgmname), 1); -+ tmp = malloc( strlen( pgmname ) + 1 ); - RLE_CHECK_ALLOC( pgmname, tmp, 0 ); - strcpy( tmp, pgmname ); - the_hdr->cmd = tmp; -@@ -87,7 +92,9 @@ int img_num; - - if ( the_hdr->file_name != fname ) - { -- char *tmp = (char *)malloc( strlen( fname ) + 1 ); -+ char *tmp; -+ overflow_add(strlen(fname), 1); -+ tmp = malloc( strlen( fname ) + 1 ); - RLE_CHECK_ALLOC( pgmname, tmp, 0 ); - strcpy( tmp, fname ); - the_hdr->file_name = tmp; -@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; - if ( to_hdr->bg_color ) - { - int size = to_hdr->ncolors * sizeof(int); -+ overflow2(to_hdr->ncolors, sizeof(int)); - to_hdr->bg_color = (int *)malloc( size ); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); - memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); -@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; - if ( to_hdr->cmap ) - { - int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); -- to_hdr->cmap = (rle_map *)malloc( size ); -+ to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<cmaplen, sizeof(rle_map)); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); - memcpy( to_hdr->cmap, from_hdr->cmap, size ); - } -@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; - int size = 0; - CONST_DECL char **cp; - for ( cp=to_hdr->comments; *cp; cp++ ) -+ { -+ overflow_add(size, 1); - size++; /* Count the comments. */ -+ } - /* Check if there are really any comments. */ - if ( size ) - { -+ overflow_add(size, 1); - size++; /* Copy the NULL pointer, too. */ -+ overflow2(size, sizeof(char *)); - size *= sizeof(char *); - to_hdr->comments = (CONST_DECL char **)malloc( size ); - RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff -up netpbm-10.35.46/urt/rle.h.security netpbm-10.35.46/urt/rle.h ---- netpbm-10.35.46/urt/rle.h.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle.h 2008-06-24 09:04:21.000000000 +0200 -@@ -14,6 +14,9 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox -+ * Header declarations needed - */ - /* - * rle.h - Global declarations for Utah Raster Toolkit RLE programs. -@@ -166,6 +169,17 @@ rle_hdr /* End of typedef. * - */ - extern rle_hdr rle_dflt_hdr; - -+/* -+ * Provided by pm library -+ */ -+ -+extern void overflow_add(int, int); -+#define overflow2(a,b) __overflow2(a,b) -+extern void __overflow2(int, int); -+extern void overflow3(int, int, int); -+extern void *malloc2(int, int); -+extern void *malloc3(int, int, int); -+extern void *realloc2(void *, int, int); - - /* Declare RLE library routines. */ - -diff -up netpbm-10.35.46/urt/rle_open_f.c.security netpbm-10.35.46/urt/rle_open_f.c ---- netpbm-10.35.46/urt/rle_open_f.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle_open_f.c 2008-06-24 09:04:21.000000000 +0200 -@@ -6,6 +6,9 @@ - * University of Michigan - * Date: 11/14/89 - * Copyright (c) 1990, University of Michigan -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox -+ * Killed of crazy unsafe pipe/compress stuff - */ - - #define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -@@ -188,7 +191,7 @@ rle_open_f_noexit(const char * const pro - - cp = file_name + strlen( (char*) file_name ) - 2; - /* Pipe case. */ -- if ( *file_name == '|' ) -+ if ( *file_name == '|' && 0 /* BOLLOCKS ARE WE DOING THIS ANY MORE */) - { - int thepid; /* PID from my_popen */ - if ( (fp = my_popen( file_name + 1, mode, &thepid )) == NULL ) -@@ -203,9 +206,10 @@ rle_open_f_noexit(const char * const pro - } - - /* Compress case. */ -- else if ( cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) -+ else if ( /* SMOKING SOMETHING */ 0 && cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) - { - int thepid; /* PID from my_popen. */ -+ overflow_add(20, strlen(file_name)); - combuf = (char *)malloc( 20 + strlen( file_name ) ); - if ( combuf == NULL ) - { -diff -up netpbm-10.35.46/urt/rle_putcom.c.security netpbm-10.35.46/urt/rle_putcom.c ---- netpbm-10.35.46/urt/rle_putcom.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/rle_putcom.c 2008-06-24 09:04:21.000000000 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rle_putcom.c - Add a picture comment to the header struct. -@@ -98,12 +100,14 @@ rle_putcom(const char * const value, - const char * v; - const char ** old_comments; - int i; -- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) -+ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) { -+ overflow_add(i, 1); - if (match(value, *cp) != NULL) { - v = *cp; - *cp = value; - return v; - } -+ } - /* Not found */ - /* Can't realloc because somebody else might be pointing to this - * comments block. Of course, if this were true, then the -diff -up netpbm-10.35.46/urt/Runput.c.security netpbm-10.35.46/urt/Runput.c ---- netpbm-10.35.46/urt/Runput.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/Runput.c 2008-06-24 09:04:21.000000000 +0200 -@@ -17,6 +17,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * Runput.c - General purpose Run Length Encoding. -@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) - if ( the_hdr->background != 0 ) - { - register int i; -- register rle_pixel *background = -- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); -+ register rle_pixel *background; - register int *bg_color; -+ -+ overflow_add(the_hdr->ncolors,1); -+ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); - /* - * If even number of bg color bytes, put out one more to get to - * 16 bit boundary. -@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) - /* Big-endian machines are harder */ - register int i, nmap = (1 << the_hdr->cmaplen) * - the_hdr->ncmap; -- register char *h_cmap = (char *)malloc( nmap * 2 ); -+ register char *h_cmap = (char *)malloc2( nmap, 2 ); - if ( h_cmap == NULL ) - { - fprintf( stderr, -diff -up netpbm-10.35.46/urt/scanargs.c.security netpbm-10.35.46/urt/scanargs.c ---- netpbm-10.35.46/urt/scanargs.c.security 2008-06-24 08:59:24.000000000 +0200 -+++ netpbm-10.35.46/urt/scanargs.c 2008-06-24 09:04:21.000000000 +0200 -@@ -38,6 +38,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - - #include "rle.h" -@@ -65,8 +67,8 @@ typedef int *ptr; - /* - * Storage allocation macros - */ --#define NEW( type, cnt ) (type *) malloc( (cnt) * sizeof( type ) ) --#define RENEW( type, ptr, cnt ) (type *) realloc( ptr, (cnt) * sizeof( type ) ) -+#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) -+#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) - - #if defined(c_plusplus) && !defined(USE_PROTOTYPES) - #define USE_PROTOTYPES -diff -up netpbm-10.35.60/converter/other/xwdtopnm.c.security netpbm-10.35.60/converter/other/xwdtopnm.c ---- netpbm-10.35.60/converter/other/xwdtopnm.c.security 2009-02-15 13:04:43.000000000 +0100 -+++ netpbm-10.35.60/converter/other/xwdtopnm.c 2009-02-16 12:15:50.000000000 +0100 -@@ -214,6 +214,10 @@ processX10Header(X10WDFileHeader * cons - *colorsP = pnm_allocrow( 2 ); - PNM_ASSIGN1( (*colorsP)[0], 0 ); - PNM_ASSIGN1( (*colorsP)[1], *maxvalP ); -+ overflow_add(h10P->pixmap_width, 15); -+ if(h10P->pixmap_width < 0) -+ pm_error("assert: negative width"); -+ overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8); - *padrightP = - (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8; - *bits_per_itemP = 16; -@@ -608,6 +612,7 @@ processX11Header(X11WDFileHeader * cons - - *colsP = h11FixedP->pixmap_width; - *rowsP = h11FixedP->pixmap_height; -+ overflow2(h11FixedP->bytes_per_line, 8); - *padrightP = - h11FixedP->bytes_per_line * 8 - - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; diff --git a/netpbm-10.24-nodoc.patch b/netpbm-10.24-nodoc.patch deleted file mode 100644 index 2ecf665..0000000 --- a/netpbm-10.24-nodoc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netpbm-10.24/GNUmakefile.nodoc 2004-08-11 20:41:54.000000000 +0200 -+++ netpbm-10.24/GNUmakefile 2004-09-23 16:08:29.724369240 +0200 -@@ -275,16 +275,12 @@ - endif - - .PHONY: install.manweb --install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url -+install.manweb: $(PKGDIR)/man/web/netpbm.url - - $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web - echo "$(NETPBM_DOCURL)" > $@ - chmod $(INSTALL_PERM_MAN) $@ - --$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin -- echo "$(NETPBM_DOCURL)" > $@ -- chmod $(INSTALL_PERM_MAN) $@ -- - .PHONY: install-dev - # Note that you might install the development package and NOT the runtime - # package. If you have a special system for building stuff, maybe for diff --git a/netpbm-10.27-bmptopnm.patch b/netpbm-10.27-bmptopnm.patch deleted file mode 100644 index 9095427..0000000 --- a/netpbm-10.27-bmptopnm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 -+++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 -@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, - xel ** const colormapP, - bool const verbose) { - -- xel * colormap; /* malloc'ed */ -+ xel * colormap = NULL; /* malloc'ed */ - unsigned int pos; - /* Current byte position in the BMP file */ - diff --git a/netpbm-10.28-CAN-2005-2471.patch b/netpbm-10.28-CAN-2005-2471.patch deleted file mode 100644 index 8cbbd6d..0000000 --- a/netpbm-10.28-CAN-2005-2471.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 -+++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 -@@ -711,11 +711,11 @@ - "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", - ghostscriptProg, arg0, - deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", -- "-dSAFER", "-"); -+ "-dPARANOIDSAFER", "-"); - } - - execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -- "-dNOPAUSE", "-dSAFER", "-", NULL); -+ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); - - pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", - ghostscriptProg, errno, strerror(errno)); diff --git a/netpbm-10.28-gcc4.patch b/netpbm-10.28-gcc4.patch deleted file mode 100644 index 9ecd296..0000000 --- a/netpbm-10.28-gcc4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netpbm-10.30/lib/pm.h.gcc4 2005-10-21 12:19:56.000000000 +0200 -+++ netpbm-10.30/lib/pm.h 2005-10-21 12:20:03.000000000 +0200 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- netpbm-10.30/urt/rle.h.gcc4 2005-10-21 12:19:56.000000000 +0200 -+++ netpbm-10.30/urt/rle.h 2005-10-21 12:21:31.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "rle_config.h" /* Configuration parameters. */ - - #include /* Declare FILE. */ -+#include - - #ifdef c_plusplus - #define USE_PROTOTYPES diff --git a/netpbm-10.31-xwdfix.patch b/netpbm-10.31-xwdfix.patch deleted file mode 100644 index 88626c7..0000000 --- a/netpbm-10.31-xwdfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix 2006-09-18 13:24:50.000000000 +0200 -+++ netpbm-10.35/converter/other/xwdtopnm.c 2006-09-18 13:27:26.000000000 +0200 -@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) { - unsigned long const bitsToTakeMask = lsbmask[nBitsToTake]; - /* E.g. if nbitsToTake is 4, this is 0x0000000F */ - -- unsigned long bitsToTake; -+ unsigned int bitsToTake; - /* The actual bits we take, in the 'nBitsToTake' low bits */ - - assert(nBitsToTake <= 32); diff --git a/netpbm-10.32-pnmdepth.patch b/netpbm-10.32-pnmdepth.patch deleted file mode 100644 index a83fd51..0000000 --- a/netpbm-10.32-pnmdepth.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- netpbm-10.32/other/Makefile.pnmdepth 2006-01-03 23:47:15.000000000 +0100 -+++ netpbm-10.32/other/Makefile 2006-04-03 14:53:17.000000000 +0200 -@@ -66,7 +66,7 @@ - $(SYMLINK) pamsplit$(EXE) pnmsplit - # In February 2006, pamdepth replaced pnmdepth - cd $(PKGDIR)/bin ; \ -- rm -f pnmsdepth ; \ -- $(SYMLINK) pnmsdepth$(EXE) pnmdepth -+ rm -f pnmdepth ; \ -+ $(SYMLINK) pamdepth$(EXE) pnmdepth - - FORCE: diff --git a/netpbm-10.33-multilib.patch b/netpbm-10.33-multilib.patch deleted file mode 100644 index 5c559d3..0000000 --- a/netpbm-10.33-multilib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- netpbm-10.33/buildtools/endiangen.c.multilib 2005-04-30 18:36:33.000000000 +0200 -+++ netpbm-10.33/buildtools/endiangen.c 2006-06-05 22:21:43.000000000 +0200 -@@ -87,7 +87,6 @@ - byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN"); - printf("#endif\n"); - printf("\n"); -- printf("#define BITS_PER_WORD %u\n", bitsPerWord()); - - return 0; - } diff --git a/netpbm-10.33-ppmtompeg.patch b/netpbm-10.33-ppmtompeg.patch deleted file mode 100644 index f443e44..0000000 --- a/netpbm-10.33-ppmtompeg.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 2006-09-18 12:20:24.000000000 +0200 -+++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c 2006-09-18 13:35:53.000000000 +0200 -@@ -115,8 +115,7 @@ Fsize_Note(int const id, - Fsize_Validate(&Fsize_x, &Fsize_y); - - if ((Fsize_x == 0) || (Fsize_y == 0)) { -- fprintf(stderr,"Frame %d: size is less than the minimum: %d x %d!\n", -- id, DCTSIZE*2, DCTSIZE*2); -+ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id); - exit(1); - } - ---- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-09-18 13:30:49.000000000 +0200 -+++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c 2006-09-18 13:32:24.000000000 +0200 -@@ -1316,8 +1316,6 @@ CombineServer(int const numFram - TransmitPortNum(masterHostName, masterPortNum, combinePortNum); - - close(outputServerSocket); -- -- fclose(ofP); - } - - diff --git a/netpbm-10.34-pamscale.patch b/netpbm-10.34-pamscale.patch deleted file mode 100644 index 3a9274b..0000000 --- a/netpbm-10.34-pamscale.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netpbm-10.34/editor/pamscale.c.pamscale 2006-03-16 01:33:49.000000000 +0100 -+++ netpbm-10.34/editor/pamscale.c 2006-08-12 20:12:14.000000000 +0200 -@@ -2081,6 +2081,8 @@ - struct pam inpam, outpam; - float xscale, yscale; - -+ memset(&cmdline, 0, sizeof(cmdline)); -+ - pnm_init(&argc, argv); - - parseCommandLine(argc, argv, &cmdline); diff --git a/netpbm-10.35-64bitfix.patch b/netpbm-10.35-64bitfix.patch deleted file mode 100644 index 3a19ea4..0000000 --- a/netpbm-10.35-64bitfix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c ---- netpbm-10.35.58/lib/libpm.c.64bitfix 2009-01-22 08:49:25.000000000 +0100 -+++ netpbm-10.35.58/lib/libpm.c 2009-01-22 08:50:38.000000000 +0100 -@@ -1069,7 +1069,7 @@ - pm_readbiglong(FILE * const ifP, - long * const lP) { - -- int c; -+ unsigned int c; - unsigned long l; - - c = getc(ifP); -@@ -1148,7 +1148,7 @@ - int - pm_readlittlelong(FILE * const ifP, - long * const lP) { -- int c; -+ unsigned int c; - unsigned long l; - - c = getc(ifP); diff --git a/netpbm-10.35-gcc43.patch b/netpbm-10.35-gcc43.patch deleted file mode 100644 index 36eea6f..0000000 --- a/netpbm-10.35-gcc43.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netpbm-10.35.36/lib/libpbm3.c.gcc43 netpbm-10.35.36/lib/libpbm3.c ---- netpbm-10.35.36/lib/libpbm3.c.gcc43 2007-12-31 07:02:07.000000000 +0100 -+++ netpbm-10.35.36/lib/libpbm3.c 2008-01-08 13:08:52.000000000 +0100 -@@ -105,7 +105,7 @@ packBitsWithMmxSse(FILE * const - ) ]; - */ - -- typedef int v8qi __attribute__ ((mode(V8QI))); -+ typedef int v8qi __attribute__ ((vector_size(8))); - typedef int di __attribute__ ((mode(DI))); - - di const zero64 = 0; /* to clear with PXOR */ diff --git a/netpbm-10.35-glibc.patch b/netpbm-10.35-glibc.patch deleted file mode 100644 index 4ae71e8..0000000 --- a/netpbm-10.35-glibc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200 -+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200 -@@ -974,8 +974,8 @@ int main( int argc, char **argv ) { - - if ( (err = parseOpts( argc, argv, rt )) ) goto exit ; - -- if ( (err = rt->in->open( rt->in, rt )) ) goto exit ; -- if ( (err = rt->out->open( rt->out, rt )) ) goto exit ; -+ if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ; -+ if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ; - - while ( rt->in->hasMore( rt->in ) ) { - if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ; diff --git a/netpbm-10.35-pnmmontagefix.patch b/netpbm-10.35-pnmmontagefix.patch deleted file mode 100644 index 3b28fd8..0000000 --- a/netpbm-10.35-pnmmontagefix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix netpbm-10.35.57/editor/pnmmontage.c ---- netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix 2008-12-15 10:04:29.000000000 +0100 -+++ netpbm-10.35.57/editor/pnmmontage.c 2008-12-23 20:09:01.000000000 +0100 -@@ -346,6 +346,7 @@ main(int argc, char **argv) - } - - pnm_readpaminit(imgs[0].file, &imgs[0], PAM_STRUCT_SIZE(tuple_type)); -+ memset(&outimg, 0, sizeof(outimg)); - outimg.maxval = imgs[0].maxval; - outimg.format = imgs[0].format; - memcpy(outimg.tuple_type, imgs[0].tuple_type, sizeof(imgs[0].tuple_type)); diff --git a/netpbm-10.35-pnmtofiasco-stdin.patch b/netpbm-10.35-pnmtofiasco-stdin.patch deleted file mode 100644 index 4fbb32e..0000000 --- a/netpbm-10.35-pnmtofiasco-stdin.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c ---- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 -+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c 2009-01-21 08:03:00.000000000 +0100 -@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna - */ - { - char *filename; -- int width, w = 0, height, h = 0; -+ int width, w = 0, height, h = 0, format; - bool_t color, c = NO; -+ xelval maxval; - unsigned n; - - for (n = 0; (filename = get_input_image_name (inputname, n)); n++) - { - FILE *file; -- xelval maxval; -- int format; - if (filename == NULL) - file = stdin; - else -@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna - wi->width = w; - wi->height = h; - wi->color = c; -+ wi->format = format; -+ wi->maxval = maxval; - } - - /* -@@ -642,7 +643,18 @@ video_coder (char const * const *image_t - */ - future_frame = frame == future_display; - c->mt->number = frame; -- c->mt->original = read_image (image_name); -+ if (strcmp(image_name, "-")) { -+ c->mt->original = read_image (image_name); -+ } else { /* stdin is not seekable - read image contents without rewind */ -+ int width = wfa->wfainfo->width; -+ int height = wfa->wfainfo->height; -+ int color = wfa->wfainfo->color; -+ int format = wfa->wfainfo->format; -+ xelval maxval = wfa->wfainfo->maxval; -+ -+ c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4); -+ read_image_data(c->mt->original, stdin, color, width, height, maxval, format); -+ } - if (c->tiling->exponent && type == I_FRAME) - perform_tiling (c->mt->original, c->tiling); - -diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h ---- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 -+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h 2009-01-21 08:03:28.000000000 +0100 -@@ -75,6 +75,7 @@ typedef struct range_info - unsigned level; /* bintree level of range */ - } range_info_t; - -+#include "pnm.h" - #include "image.h" - #include "rpf.h" - #include "bit-io.h" -@@ -93,6 +94,8 @@ typedef struct wfa_info - unsigned width; /* image width */ - unsigned height; /* image height */ - unsigned level; /* image level */ -+ unsigned format; /* image format */ -+ xelval maxval; /* image maximal pixel intensity value */ - rpf_t *rpf; /* Standard reduced precision format */ - rpf_t *dc_rpf; /* DC reduced precision format */ - rpf_t *d_rpf; /* Delta reduced precision format */ -diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c ---- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 -+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c 2009-01-21 08:01:53.000000000 +0100 -@@ -273,7 +273,7 @@ free_image (image_t *image) - } - - --static void -+void - read_image_data(image_t * const image, FILE *input, const bool_t color, - const int width, const int height, const xelval maxval, - const int format) { -diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h ---- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 -+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h 2009-01-21 08:02:29.000000000 +0100 -@@ -17,6 +17,8 @@ - #ifndef _IMAGE_H - #define _IMAGE_H - -+#include "pnm.h" -+ - #include - #include "types.h" - #include "fiasco.h" -@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, - image_t * - read_image (const char *image_name); - void -+read_image_data(image_t * const image, FILE *input, const bool_t color, -+ const int width, const int height, const xelval maxval, -+ const int format); -+void - write_image (const char *image_name, const image_t *image); - bool_t - same_image_type (const image_t *img1, const image_t *img2); diff --git a/netpbm-10.35-rgbtxt.patch b/netpbm-10.35-rgbtxt.patch deleted file mode 100644 index 6b3a43c..0000000 --- a/netpbm-10.35-rgbtxt.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up netpbm-10.35.40/pm_config.in.h.rgbtxt netpbm-10.35.40/pm_config.in.h ---- netpbm-10.35.40/pm_config.in.h.rgbtxt 2008-03-09 11:28:32.000000000 +0100 -+++ netpbm-10.35.40/pm_config.in.h 2008-03-14 12:27:28.000000000 +0100 -@@ -67,9 +67,9 @@ - #define RGB_DB2 "PBMplus_Dir:RGB.TXT" - #define RGB_DB3 "PBMplus_Dir:RGB.TXT" - #else --#define RGB_DB1 "/usr/lib/X11/rgb.txt" --#define RGB_DB2 "/usr/share/X11/rgb.txt" --#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" -+#define RGB_DB1 "/usr/share/netpbm/rgb.txt" -+#define RGB_DB2 "/usr/lib/X11/rgb.txt" -+#define RGB_DB3 "/usr/share/X11/rgb.txt" - #endif - - /* CONFIGURE: This is the name of an environment variable that tells diff --git a/netpbm-10.35-svgtopam.patch b/netpbm-10.35-svgtopam.patch deleted file mode 100644 index bd03f55..0000000 --- a/netpbm-10.35-svgtopam.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile ---- netpbm-10.35.67/converter/other/Makefile.svgtopam 2009-09-04 13:57:06.000000000 +0200 -+++ netpbm-10.35.67/converter/other/Makefile 2009-09-04 14:09:00.000000000 +0200 -@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE) - BINARIES += pnmtops - endif - --ifneq ($(XML2_LIBS),NONE) -- BINARIES += svgtopam --endif -- - MERGEBINARIES = $(BINARIES) - - EXTRA_OBJECTS = exif.o rast.o bmepsoe.o diff --git a/netpbm-9.24-strip.patch b/netpbm-9.24-strip.patch deleted file mode 100644 index c06cd29..0000000 --- a/netpbm-9.24-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- netpbm-9.24/Makefile.config.in.strip Wed Jun 19 16:02:02 2002 -+++ netpbm-9.24/Makefile.config.in Wed Jun 19 16:09:25 2002 -@@ -56,9 +56,9 @@ - - # STRIPFLAG is the option you pass to the above install program to make it - # strip unnecessary information out of binaries. --STRIPFLAG = -s -+# STRIPFLAG = -s - # If you don't want to strip the binaries, just leave it null: --#STRIPFLAG = -+STRIPFLAG = - - SYMLINK = ln -s - # At least some Windows environments don't have any concept of symbolic diff --git a/netpbm-CAN-2005-2471.patch b/netpbm-CAN-2005-2471.patch new file mode 100644 index 0000000..8cbbd6d --- /dev/null +++ b/netpbm-CAN-2005-2471.patch @@ -0,0 +1,16 @@ +--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 ++++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 +@@ -711,11 +711,11 @@ + "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", + ghostscriptProg, arg0, + deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", +- "-dSAFER", "-"); ++ "-dPARANOIDSAFER", "-"); + } + + execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", +- "-dNOPAUSE", "-dSAFER", "-", NULL); ++ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); + + pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", + ghostscriptProg, errno, strerror(errno)); diff --git a/netpbm-bmptopnm.patch b/netpbm-bmptopnm.patch new file mode 100644 index 0000000..9095427 --- /dev/null +++ b/netpbm-bmptopnm.patch @@ -0,0 +1,11 @@ +--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 ++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 +@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, + xel ** const colormapP, + bool const verbose) { + +- xel * colormap; /* malloc'ed */ ++ xel * colormap = NULL; /* malloc'ed */ + unsigned int pos; + /* Current byte position in the BMP file */ + diff --git a/netpbm-gcc4.patch b/netpbm-gcc4.patch new file mode 100644 index 0000000..9ecd296 --- /dev/null +++ b/netpbm-gcc4.patch @@ -0,0 +1,20 @@ +--- netpbm-10.30/lib/pm.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/lib/pm.h 2005-10-21 12:20:03.000000000 +0200 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- netpbm-10.30/urt/rle.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/urt/rle.h 2005-10-21 12:21:31.000000000 +0200 +@@ -36,6 +36,7 @@ + #include "rle_config.h" /* Configuration parameters. */ + + #include /* Declare FILE. */ ++#include + + #ifdef c_plusplus + #define USE_PROTOTYPES diff --git a/netpbm-glibc.patch b/netpbm-glibc.patch new file mode 100644 index 0000000..4ae71e8 --- /dev/null +++ b/netpbm-glibc.patch @@ -0,0 +1,13 @@ +--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200 ++++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200 +@@ -974,8 +974,8 @@ int main( int argc, char **argv ) { + + if ( (err = parseOpts( argc, argv, rt )) ) goto exit ; + +- if ( (err = rt->in->open( rt->in, rt )) ) goto exit ; +- if ( (err = rt->out->open( rt->out, rt )) ) goto exit ; ++ if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ; ++ if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ; + + while ( rt->in->hasMore( rt->in ) ) { + if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ; diff --git a/netpbm-message.patch b/netpbm-message.patch new file mode 100644 index 0000000..64efd6e --- /dev/null +++ b/netpbm-message.patch @@ -0,0 +1,12 @@ +diff -up netpbm-10.47.04/converter/other/giftopnm.c.message netpbm-10.47.04/converter/other/giftopnm.c +--- netpbm-10.47.04/converter/other/giftopnm.c.message 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/giftopnm.c 2009-10-21 14:34:42.000000000 +0200 +@@ -1676,7 +1676,7 @@ convertImages(FILE * const ifP, + imageSeq, imageSeq > 1 ? "s" : ""); + } else { + if (verbose) +- pm_message("Reading Image Sequence %d", imageSeq); ++ pm_message("Reading Image Sequence %d", imageSeq+1); + convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), + imageout_file, alphafile, gifScreen, gif89, + tolerateBadInput); diff --git a/netpbm-multilib.patch b/netpbm-multilib.patch new file mode 100644 index 0000000..ea689bc --- /dev/null +++ b/netpbm-multilib.patch @@ -0,0 +1,11 @@ +diff -up netpbm-10.47.04/buildtools/endiangen.c.multilib netpbm-10.47.04/buildtools/endiangen.c +--- netpbm-10.47.04/buildtools/endiangen.c.multilib 2009-10-21 13:38:54.000000000 +0200 ++++ netpbm-10.47.04/buildtools/endiangen.c 2009-10-21 14:35:58.000000000 +0200 +@@ -87,7 +87,6 @@ main(int argc, char **argv) { + byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN"); + printf("#endif\n"); + printf("\n"); +- printf("#define BITS_PER_LONG %u\n", bitsPerLong()); + + return 0; + } diff --git a/netpbm-nodoc.patch b/netpbm-nodoc.patch new file mode 100644 index 0000000..2ecf665 --- /dev/null +++ b/netpbm-nodoc.patch @@ -0,0 +1,20 @@ +--- netpbm-10.24/GNUmakefile.nodoc 2004-08-11 20:41:54.000000000 +0200 ++++ netpbm-10.24/GNUmakefile 2004-09-23 16:08:29.724369240 +0200 +@@ -275,16 +275,12 @@ + endif + + .PHONY: install.manweb +-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url ++install.manweb: $(PKGDIR)/man/web/netpbm.url + + $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web + echo "$(NETPBM_DOCURL)" > $@ + chmod $(INSTALL_PERM_MAN) $@ + +-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin +- echo "$(NETPBM_DOCURL)" > $@ +- chmod $(INSTALL_PERM_MAN) $@ +- + .PHONY: install-dev + # Note that you might install the development package and NOT the runtime + # package. If you have a special system for building stuff, maybe for diff --git a/netpbm-pamscale.patch b/netpbm-pamscale.patch new file mode 100644 index 0000000..3a9274b --- /dev/null +++ b/netpbm-pamscale.patch @@ -0,0 +1,11 @@ +--- netpbm-10.34/editor/pamscale.c.pamscale 2006-03-16 01:33:49.000000000 +0100 ++++ netpbm-10.34/editor/pamscale.c 2006-08-12 20:12:14.000000000 +0200 +@@ -2081,6 +2081,8 @@ + struct pam inpam, outpam; + float xscale, yscale; + ++ memset(&cmdline, 0, sizeof(cmdline)); ++ + pnm_init(&argc, argv); + + parseCommandLine(argc, argv, &cmdline); diff --git a/netpbm-pnmdepth.patch b/netpbm-pnmdepth.patch new file mode 100644 index 0000000..a83fd51 --- /dev/null +++ b/netpbm-pnmdepth.patch @@ -0,0 +1,12 @@ +--- netpbm-10.32/other/Makefile.pnmdepth 2006-01-03 23:47:15.000000000 +0100 ++++ netpbm-10.32/other/Makefile 2006-04-03 14:53:17.000000000 +0200 +@@ -66,7 +66,7 @@ + $(SYMLINK) pamsplit$(EXE) pnmsplit + # In February 2006, pamdepth replaced pnmdepth + cd $(PKGDIR)/bin ; \ +- rm -f pnmsdepth ; \ +- $(SYMLINK) pnmsdepth$(EXE) pnmdepth ++ rm -f pnmdepth ; \ ++ $(SYMLINK) pamdepth$(EXE) pnmdepth + + FORCE: diff --git a/netpbm-pnmtofiasco-stdin.patch b/netpbm-pnmtofiasco-stdin.patch new file mode 100644 index 0000000..4fbb32e --- /dev/null +++ b/netpbm-pnmtofiasco-stdin.patch @@ -0,0 +1,105 @@ +diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c +--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 ++++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c 2009-01-21 08:03:00.000000000 +0100 +@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna + */ + { + char *filename; +- int width, w = 0, height, h = 0; ++ int width, w = 0, height, h = 0, format; + bool_t color, c = NO; ++ xelval maxval; + unsigned n; + + for (n = 0; (filename = get_input_image_name (inputname, n)); n++) + { + FILE *file; +- xelval maxval; +- int format; + if (filename == NULL) + file = stdin; + else +@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna + wi->width = w; + wi->height = h; + wi->color = c; ++ wi->format = format; ++ wi->maxval = maxval; + } + + /* +@@ -642,7 +643,18 @@ video_coder (char const * const *image_t + */ + future_frame = frame == future_display; + c->mt->number = frame; +- c->mt->original = read_image (image_name); ++ if (strcmp(image_name, "-")) { ++ c->mt->original = read_image (image_name); ++ } else { /* stdin is not seekable - read image contents without rewind */ ++ int width = wfa->wfainfo->width; ++ int height = wfa->wfainfo->height; ++ int color = wfa->wfainfo->color; ++ int format = wfa->wfainfo->format; ++ xelval maxval = wfa->wfainfo->maxval; ++ ++ c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4); ++ read_image_data(c->mt->original, stdin, color, width, height, maxval, format); ++ } + if (c->tiling->exponent && type == I_FRAME) + perform_tiling (c->mt->original, c->tiling); + +diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h +--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 ++++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h 2009-01-21 08:03:28.000000000 +0100 +@@ -75,6 +75,7 @@ typedef struct range_info + unsigned level; /* bintree level of range */ + } range_info_t; + ++#include "pnm.h" + #include "image.h" + #include "rpf.h" + #include "bit-io.h" +@@ -93,6 +94,8 @@ typedef struct wfa_info + unsigned width; /* image width */ + unsigned height; /* image height */ + unsigned level; /* image level */ ++ unsigned format; /* image format */ ++ xelval maxval; /* image maximal pixel intensity value */ + rpf_t *rpf; /* Standard reduced precision format */ + rpf_t *dc_rpf; /* DC reduced precision format */ + rpf_t *d_rpf; /* Delta reduced precision format */ +diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c +--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 ++++ netpbm-10.35.58/converter/other/fiasco/lib/image.c 2009-01-21 08:01:53.000000000 +0100 +@@ -273,7 +273,7 @@ free_image (image_t *image) + } + + +-static void ++void + read_image_data(image_t * const image, FILE *input, const bool_t color, + const int width, const int height, const xelval maxval, + const int format) { +diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h +--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100 ++++ netpbm-10.35.58/converter/other/fiasco/lib/image.h 2009-01-21 08:02:29.000000000 +0100 +@@ -17,6 +17,8 @@ + #ifndef _IMAGE_H + #define _IMAGE_H + ++#include "pnm.h" ++ + #include + #include "types.h" + #include "fiasco.h" +@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, + image_t * + read_image (const char *image_name); + void ++read_image_data(image_t * const image, FILE *input, const bool_t color, ++ const int width, const int height, const xelval maxval, ++ const int format); ++void + write_image (const char *image_name, const image_t *image); + bool_t + same_image_type (const image_t *img1, const image_t *img2); diff --git a/netpbm-ppmtompeg.patch b/netpbm-ppmtompeg.patch new file mode 100644 index 0000000..f443e44 --- /dev/null +++ b/netpbm-ppmtompeg.patch @@ -0,0 +1,23 @@ +--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 2006-09-18 12:20:24.000000000 +0200 ++++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c 2006-09-18 13:35:53.000000000 +0200 +@@ -115,8 +115,7 @@ Fsize_Note(int const id, + Fsize_Validate(&Fsize_x, &Fsize_y); + + if ((Fsize_x == 0) || (Fsize_y == 0)) { +- fprintf(stderr,"Frame %d: size is less than the minimum: %d x %d!\n", +- id, DCTSIZE*2, DCTSIZE*2); ++ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id); + exit(1); + } + +--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-09-18 13:30:49.000000000 +0200 ++++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c 2006-09-18 13:32:24.000000000 +0200 +@@ -1316,8 +1316,6 @@ CombineServer(int const numFram + TransmitPortNum(masterHostName, masterPortNum, combinePortNum); + + close(outputServerSocket); +- +- fclose(ofP); + } + + diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch new file mode 100644 index 0000000..806f605 --- /dev/null +++ b/netpbm-security-code.patch @@ -0,0 +1,1913 @@ +diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c +--- netpbm-10.47.04/analyzer/pgmtexture.c.security 2009-10-21 13:38:55.000000000 +0200 ++++ netpbm-10.47.04/analyzer/pgmtexture.c 2009-10-21 15:09:33.000000000 +0200 +@@ -79,6 +79,9 @@ vector (int nl, int nh) + { + float *v; + ++ if(nh < nl) ++ pm_error("assert: h < l"); ++ overflow_add(nh - nl, 1); + MALLOCARRAY(v, (unsigned) (nh - nl + 1)); + if (v == NULL) + pm_error("Unable to allocate memory for a vector."); +@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n + float **m; + + /* allocate pointers to rows */ ++ if(nrh < nrl) ++ pm_error("assert: h < l"); ++ overflow_add(nrh - nrl, 1); + MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); + if (m == NULL) + pm_error("Unable to allocate memory for a matrix."); +@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n + m -= ncl; + + /* allocate rows and set pointers to them */ ++ if(nch < ncl) ++ pm_error("assert: h < l"); ++ overflow_add(nch - ncl, 1); + for (i = nrl; i <= nrh; i++) + { + MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); +diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c +--- netpbm-10.47.04/converter/other/gemtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/gemtopnm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -106,6 +106,7 @@ main(argc, argv) + + pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); + ++ overflow_add(cols, padright); + { + /* allocate input row data structure */ + int plane; +diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c +--- netpbm-10.47.04/converter/other/jpegtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/jpegtopnm.c 2009-10-21 15:54:30.000000000 +0200 +@@ -861,6 +861,8 @@ convertImage(FILE * + /* Calculate output image dimensions so we can allocate space */ + jpeg_calc_output_dimensions(cinfoP); + ++ overflow2(cinfoP->output_width, cinfoP->output_components); ++ + /* Start decompressor */ + jpeg_start_decompress(cinfoP); + +diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c +--- netpbm-10.47.04/converter/other/pbmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pbmtopgm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -47,6 +47,7 @@ main(int argc, char *argv[]) { + "than the image height (%u rows)", height, rows); + + outrow = pgm_allocrow(cols) ; ++ overflow2(width, height); + maxval = MIN(PGM_OVERALLMAXVAL, width*height); + pgm_writepgminit(stdout, cols, rows, maxval, 0) ; + +diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c +diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c +--- netpbm-10.47.04/converter/other/pnmtoddif.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pnmtoddif.c 2009-10-21 15:09:33.000000000 +0200 +@@ -632,6 +632,7 @@ main(int argc, char *argv[]) { + switch (PNM_FORMAT_TYPE(format)) { + case PBM_TYPE: + ip.bits_per_pixel = 1; ++ overflow_add(cols, 7); + ip.bytes_per_line = (cols + 7) / 8; + ip.spectral = 2; + ip.components = 1; +@@ -647,6 +648,7 @@ main(int argc, char *argv[]) { + ip.polarity = 2; + break; + case PPM_TYPE: ++ overflow2(cols, 3); + ip.bytes_per_line = 3 * cols; + ip.bits_per_pixel = 24; + ip.spectral = 5; +diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c +--- netpbm-10.47.04/converter/other/pnmtojpeg.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pnmtojpeg.c 2009-10-21 15:56:32.000000000 +0200 +@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci + want JPOOL_PERMANENT. + */ + const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info); +- jpeg_scan_info * const scan_info = ++ const jpeg_scan_info * scan_info; ++ ++ overflow2(nscans, sizeof(jpeg_scan_info)); ++ ++ scan_info = + (jpeg_scan_info *) + (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, + scan_info_size); +@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const + const long half_maxval = maxval / 2; + long val; + ++ overflow_add(maxval, 1); ++ overflow2(maxval+1, sizeof(JSAMPLE)); + *rescale_p = (JSAMPLE *) + (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE, + (size_t) (((long) maxval + 1L) * +@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s + */ + + /* Allocate the libpnm output and compressor input buffers */ ++ overflow2(cinfo_p->image_width, cinfo_p->input_components); + buffer = (*cinfo_p->mem->alloc_sarray) + ((j_common_ptr) cinfo_p, JPOOL_IMAGE, + (unsigned int) cinfo_p->image_width * cinfo_p->input_components, +diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c +--- netpbm-10.47.04/converter/other/pnmtops.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pnmtops.c 2009-10-21 15:09:33.000000000 +0200 +@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv, + cmdlineP->canturn = !noturn; + cmdlineP->showpage = !noshowpage; + ++ overflow2(width, 72); + cmdlineP->width = width * 72; ++ overflow2(height, 72); + cmdlineP->height = height * 72; + +- if (imagewidthSpec) ++ if (imagewidthSpec) { ++ overflow2(imagewidth, 72); + cmdlineP->imagewidth = imagewidth * 72; +- else ++ } else + cmdlineP->imagewidth = 0; +- if (imageheightSpec) ++ if (imageheightSpec) { ++ overflow2(imageheight, 72); + cmdlineP->imageheight = imageheight * 72; +- else ++ } else + cmdlineP->imageheight = 0; + + if (!cmdlineP->psfilter && +diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c +--- netpbm-10.47.04/converter/other/pnmtorle.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pnmtorle.c 2009-10-21 15:09:33.000000000 +0200 +@@ -19,6 +19,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * pnmtorle - A program which will convert pbmplus (ppm or pgm) images +diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c +--- netpbm-10.47.04/converter/other/pnmtosgi.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/pnmtosgi.c 2009-10-21 15:09:33.000000000 +0200 +@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put + } + } + ++static void * ++xmalloc2(int x, int y) ++{ ++ void *mem; ++ ++ overflow2(x,y); ++ if( x * y == 0 ) ++ return NULL; ++ ++ mem = malloc2(x, y); ++ if( mem == NULL ) ++ pm_error("out of memory allocating %d bytes", x * y); ++ return mem; ++} ++ ++ + static void + put_big_short(short s) + { +@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int + #endif + + if( storage != STORAGE_VERBATIM ) { ++ overflow2(channels, rows); + MALLOCARRAY_NOFAIL(table, channels * rows); + MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); + } +@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no, + break; + case STORAGE_RLE: + tabrow = chan_no * rows + row; ++ overflow2(chan_no, rows); ++ overflow_add(chan_no* rows, row); + len = rle_compress(temp, cols); /* writes result into rletemp */ + channel[chan_no][row].length = len; + MALLOCARRAY(p, len); +diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c +--- netpbm-10.47.04/converter/other/rletopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/rletopnm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -19,6 +19,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rletopnm - A conversion program to convert from Utah's "rle" image format +diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c +--- netpbm-10.47.04/converter/other/sgitopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/sgitopnm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc + + if (ochan < 0) { + maxchannel = (head->zsize < 3) ? head->zsize : 3; ++ overflow2(head->ysize, maxchannel); + MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); + } else { + maxchannel = ochan + 1; + MALLOCARRAY_NOFAIL(image, head->ysize); + } +- if ( table ) ++ if ( table ) { ++ overflow2(head->xsize, 2); ++ overflow_add(head->xsize*2, 2); + MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); ++ } + + for( channel = 0; channel < maxchannel; channel++ ) { + #ifdef DEBUG +diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c +--- netpbm-10.47.04/converter/other/sirtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/sirtopnm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -69,6 +69,7 @@ char* argv[]; + } + break; + case PPM_TYPE: ++ overflow3(cols, rows, 3); + picsize = cols * rows * 3; + planesize = cols * rows; + if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) +diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c +--- netpbm-10.47.04/converter/other/tifftopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/tifftopnm.c 2009-10-21 15:49:29.000000000 +0200 +@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut * const + if (scanbuf == NULL) + pm_error("can't allocate memory for scanline buffer"); + +- MALLOCARRAY(samplebuf, cols * spp); ++ /* samplebuf is unsigned int * !!! */ ++ samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp); ++ + if (samplebuf == NULL) + pm_error("can't allocate memory for row buffer"); + +diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c +--- netpbm-10.47.04/converter/other/xwdtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/xwdtopnm.c 2009-10-21 15:53:27.000000000 +0200 +@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader * cons + *colorsP = pnm_allocrow(2); + PNM_ASSIGN1((*colorsP)[0], 0); + PNM_ASSIGN1((*colorsP)[1], *maxvalP); ++ overflow_add(h10P->pixmap_width, 15); ++ if(h10P->pixmap_width < 0) ++ pm_error("assert: negative width"); ++ overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8); + *padrightP = + (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8; + *bits_per_itemP = 16; +@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader * cons + + *colsP = h11FixedP->pixmap_width; + *rowsP = h11FixedP->pixmap_height; ++ overflow2(h11FixedP->bytes_per_line, 8); + *padrightP = + h11FixedP->bytes_per_line * 8 - + h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; +diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c +--- netpbm-10.47.04/converter/pbm/icontopbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/icontopbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -11,6 +11,7 @@ + */ + + #include ++#include + + #include "nstring.h" + #include "pbm.h" +@@ -87,6 +88,11 @@ ReadIconFile(FILE * const + if ( *heightP <= 0 ) + pm_error( "invalid height (must be positive): %d", *heightP ); + ++ if ( *widthP > INT_MAX - 16 || *widthP < 0) ++ pm_error( "invalid width: %d", *widthP); ++ ++ overflow2(*widthP + 16, *heightP); ++ + data_length = BitmapSize( *widthP, *heightP ); + *dataP = (short unsigned int *) malloc( data_length ); + if ( *dataP == NULL ) +diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c +--- netpbm-10.47.04/converter/pbm/mdatopbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/mdatopbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -245,10 +245,13 @@ main(int argc, char **argv) { + pm_readlittleshort(infile, &yy); nInCols = yy; + } + ++ overflow2(nOutCols, 8); + nOutCols = 8 * nInCols; + nOutRows = nInRows; +- if (bScale) ++ if (bScale) { ++ overflow2(nOutRows, 2); + nOutRows *= 2; ++ } + + data = pbm_allocarray(nOutCols, nOutRows); + +diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c +--- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/mgrtopbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, + if (head.h_high < ' ' || head.l_high < ' ') + pm_error("Invalid width field in MGR header"); + ++ overflow_add(*colsP, pad); ++ + *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); + *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); + *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; +diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c +--- netpbm-10.47.04/converter/pbm/pbmto10x.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmto10x.c 2009-10-21 15:09:33.000000000 +0200 +@@ -162,7 +162,7 @@ main(int argc, char * argv[]) { + res_60x72(); + + pm_close(ifp); +- exit(0); ++ return 0; + } + + +diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c +--- netpbm-10.47.04/converter/pbm/pbmto4425.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmto4425.c 2009-10-21 15:09:33.000000000 +0200 +@@ -2,6 +2,7 @@ + + #include "nstring.h" + #include "pbm.h" ++#include + + static char bit_table[2][3] = { + {1, 4, 0x10}, +@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { + xres = vmap_width * 2; + yres = vmap_height * 3; + +- vmap = malloc(vmap_width * vmap_height * sizeof(char)); ++ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); + if(vmap == NULL) + { + pm_error( "Cannot allocate memory" ); +diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c +--- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoascii.c 2009-10-21 15:09:33.000000000 +0200 +@@ -115,9 +115,11 @@ char* argv[]; + pm_usage( usage ); + + pbm_readpbminit( ifp, &cols, &rows, &format ); ++ overflow_add(cols, gridx); + ccols = ( cols + gridx - 1 ) / gridx; + bitrow = pbm_allocrow( cols ); + sig = (int*) pm_allocrow( ccols, sizeof(int) ); ++ overflow_add(ccols, 1); + line = (char*) pm_allocrow( ccols + 1, sizeof(char) ); + + for ( row = 0; row < rows; row += gridy ) +diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c +diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c +--- netpbm-10.47.04/converter/pbm/pbmtogem.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtogem.c 2009-10-21 15:09:33.000000000 +0200 +@@ -123,6 +123,7 @@ putinit (rows, cols) + bitsperitem = 0; + bitshift = 7; + outcol = 0; ++ overflow_add(cols, 7); + outmax = (cols + 7) / 8; + outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); + lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); +diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c +--- netpbm-10.47.04/converter/pbm/pbmtogo.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtogo.c 2009-10-21 15:09:33.000000000 +0200 +@@ -158,6 +158,7 @@ main(int argc, + bitrow = pbm_allocrow(cols); + + /* Round cols up to the nearest multiple of 8. */ ++ overflow_add(cols, 7); + rucols = ( cols + 7 ) / 8; + bytesperrow = rucols; /* GraphOn uses bytes */ + rucols = rucols * 8; +diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c +--- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoicon.c 2009-10-21 15:38:55.000000000 +0200 +@@ -114,6 +114,7 @@ writeIcon(FILE * const ifP, + unsigned char * bitrow; + unsigned int row; + ++ overflow_add(cols, 15); + bitbuffer = pbm_allocrow_packed(cols + wordintSize); + bitrow = &bitbuffer[1]; + bitbuffer[0] = 0; +diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c +--- netpbm-10.47.04/converter/pbm/pbmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtolj.c 2009-10-21 15:09:33.000000000 +0200 +@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv, + static void + allocateBuffers(unsigned int const cols) { + ++ overflow_add(cols, 8); + rowBufferSize = (cols + 7) / 8; ++ overflow_add(rowBufferSize, 128); ++ overflow_add(rowBufferSize, rowBufferSize+128); ++ overflow_add(rowBufferSize+10, rowBufferSize/8); + packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; + deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; + +diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c +--- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtomacp.c 2009-10-21 15:09:33.000000000 +0200 +@@ -101,6 +101,7 @@ char *argv[]; + if( !lflg ) + left = 0; + ++ overflow_add(left, MAX_COLS - 1); + if( rflg ) + { if( right - left >= MAX_COLS ) + right = left + MAX_COLS - 1; +@@ -111,6 +112,8 @@ char *argv[]; + if( !tflg ) + top = 0; + ++ overflow_add(top, MAX_LINES - 1); ++ + if( bflg ) + { if( bottom - top >= MAX_LINES ) + bottom = top + MAX_LINES - 1; +diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c +--- netpbm-10.47.04/converter/pbm/pbmtomda.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtomda.c 2009-10-21 15:09:33.000000000 +0200 +@@ -179,6 +179,7 @@ int main(int argc, char **argv) + + nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; + ++ overflow_add(nOutRowsUnrounded, 3); + nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; + /* MDA wants rows a multiple of 4 */ + nOutCols = nInCols / 8; +diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c +diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c +--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned + return 0; + + case P4: ++ overflow_add(pbm->width, 7); + tmp=(pbm->width+7)/8; + tmp2=fread(data,1,tmp,pbm->fptr); + if(tmp2 == tmp) +@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void + return; + + pbm->unread = 1; +- pbm->revdata = malloc ((pbm->width+7)/8); ++ overflow_add(pbm->width, 7); ++ pbm->revdata = malloc((pbm->width+7)/8); + memcpy (pbm->revdata, data, (pbm->width+7)/8); + pbm->current_line--; + } +diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c +--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c 2009-10-21 15:09:33.000000000 +0200 +@@ -441,6 +441,7 @@ main(int argc, char *argv[]) { + pm_error("main(): unrecognized parameter '%s'", argv[argn]); + } + ++ overflow_add(Width, 7); + Pwidth=(Width+7)/8; + printer.fptr=out; + +diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c +--- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c 2009-10-21 15:36:54.000000000 +0200 +@@ -335,6 +335,8 @@ convertRaster(FILE * const ifP, + + unsigned char * bitrow; + unsigned int row; ++ ++ overflow_add(cols, padright); + + putinit(xbmVersion); + +diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c +--- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtoybm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -45,6 +45,7 @@ main( argc, argv ) + bitrow = pbm_allocrow( cols ); + + /* Compute padding to round cols up to the nearest multiple of 16. */ ++ overflow_add(cols, 16); + padright = ( ( cols + 15 ) / 16 ) * 16 - cols; + + putinit( cols, rows ); +diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c +--- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pbmtozinc.c 2009-10-21 15:09:33.000000000 +0200 +@@ -65,6 +65,7 @@ main(int argc, char * argv[]) { + bitrow = pbm_allocrow( cols ); + + /* Compute padding to round cols up to the nearest multiple of 16. */ ++ overflow_add(cols, 16); + padright = ( ( cols + 15 ) / 16 ) * 16 - cols; + + printf( "USHORT %s[] = {\n",name); +diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c +--- netpbm-10.47.04/converter/pbm/pktopbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/pktopbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -277,6 +277,7 @@ main(int argc, char *argv[]) { + if (flagbyte == 7) { /* long form preamble */ + integer packetlength = get32() ; /* character packet length */ + car = get32() ; /* character number */ ++ overflow_add(packetlength, pktopbm_pkloc); + endofpacket = packetlength + pktopbm_pkloc; + /* calculate end of packet */ + if ((car >= MAXPKCHAR) || !filename[car]) { +diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l +--- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l 2009-10-21 15:09:33.000000000 +0200 +@@ -107,7 +107,9 @@ DIG [0-9] + \033\*b{DIG}+W { + int l; + if (rowCount >= rowCapacity) { ++ overflow_add(rowCapacity, 100); + rowCapacity += 100; ++ overflow2(rowCapacity, sizeof *rows); + rows = realloc (rows, rowCapacity * sizeof *rows); + if (rows == NULL) + pm_error ("Out of memory."); +@@ -217,6 +219,8 @@ yywrap (void) + /* + * Quite simple since ThinkJet bit arrangement matches PBM + */ ++ ++ overflow2(maxRowLength, 8); + pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); + + packed_bitrow = malloc(maxRowLength); +diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c +--- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/pbm/ybmtopbm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad + pm_error( "EOF / read error" ); + + *depthP = 1; ++ overflow_add(*colsP, 15); + *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP; + bitsperitem = 0; + } +diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c +--- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/pgm/lispmtopgm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -58,6 +58,7 @@ main( argc, argv ) + pm_error( "depth (%d bits) is too large", depth); + + pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 ); ++ overflow_add(cols, 7); + grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 ); + + for ( row = 0; row < rows; ++row ) +@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad + + if ( *depthP == 0 ) + *depthP = 1; /* very old file */ +- ++ ++ overflow_add((int)colsP, 31); ++ + *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; + + if ( *colsP != (cols_32 - *padrightP) ) { +diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c +--- netpbm-10.47.04/converter/pgm/psidtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/pgm/psidtopgm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -78,6 +78,7 @@ main(int argc, + pm_error("bits/sample (%d) is too large.", bitspersample); + + pgm_writepgminit(stdout, cols, rows, maxval, 0); ++ overflow_add(cols, 7); + grayrow = pgm_allocrow((cols + 7) / 8 * 8); + for (row = 0; row < rows; ++row) { + unsigned int col; +diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c +--- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -594,6 +594,7 @@ decode_row(FILE * const ifP, + rawtype *chp; + + cols = bmhdP->w; ++ overflow_add(cols, 15); + bytes = RowBytes(cols); + for( plane = 0; plane < nPlanes; plane++ ) { + int mask; +@@ -681,6 +682,23 @@ decode_mask(FILE * const ifP, + Multipalette handling + ****************************************************************************/ + ++static void * ++xmalloc2(x, y) ++ int x; ++ int y; ++{ ++ void *mem; ++ ++ overflow2(x,y); ++ if( x * y == 0 ) ++ return NULL; ++ ++ mem = malloc2(x,y); ++ if( mem == NULL ) ++ pm_error("out of memory allocating %d bytes", x * y); ++ return mem; ++} ++ + + static void + multi_adjust(cmap, row, palchange) +@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE * const ifP, + if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) + pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); + ++ overflow_add(redmaxval, 1); ++ overflow_add(greenmaxval, 1); ++ overflow_add(bluemaxval, 1); + MALLOCARRAY_NOFAIL(redtable, redmaxval +1); + MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); + MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); +@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data + ChangeCount32 = *data++; + datasize -= 2; + ++ overflow_add(ChangeCount16, ChangeCount32); + changes = ChangeCount16 + ChangeCount32; ++ overflow_add(changes, 1); + for( i = 0; i < changes; i++ ) { + if( totalchanges >= PCHG->TotalChanges ) goto fail; + if( datasize < 2 ) goto fail; +@@ -1994,6 +2017,9 @@ read_pchg(FILE * const ifp, + cmap->mp_change[i] = NULL; + if( PCHG.StartLine < 0 ) { + int nch; ++ if(PCHG.MaxReg < PCHG.MinReg) ++ pm_error("assert: MinReg > MaxReg"); ++ overflow_add(PCHG.MaxReg-PCHG.MinReg, 2); + nch = PCHG.MaxReg - PCHG.MinReg +1; + MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); + for( i = 0; i < nch; i++ ) +@@ -2070,6 +2096,7 @@ process_body( FILE * const ifp, + if( typeid == ID_ILBM ) { + int isdeep; + ++ overflow_add(bmhdP->w, 15); + MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); + *viewportmodesP |= fakeviewport; /* -isham/-isehb */ + +diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c +--- netpbm-10.47.04/converter/ppm/imgtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/imgtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -84,6 +84,7 @@ main(int argc, char ** argv) { + len = atoi((char*) buf ); + if ( fread( buf, len, 1, ifp ) != 1 ) + pm_error( "bad colormap buf" ); ++ overflow2(cmaplen, 3); + if ( cmaplen * 3 != len ) + { + pm_message( +@@ -105,6 +106,7 @@ main(int argc, char ** argv) { + pm_error( "bad pixel data header" ); + buf[8] = '\0'; + len = atoi((char*) buf ); ++ overflow2(cols, rows); + if ( len != cols * rows ) + pm_message( + "pixel data length (%d) does not match image size (%d)", +diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile +--- netpbm-10.47.04/converter/ppm/Makefile.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/Makefile 2009-10-21 15:09:33.000000000 +0200 +@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg + + PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ + leaftoppm mtvtoppm neotoppm \ +- pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ ++ pcxtoppm pc1toppm pi1toppm pjtoppm \ + ppmtoacad ppmtoarbtxt \ + ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ + ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ +diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c +--- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/pcxtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, + /* + * clear the pixel buffer + */ ++ overflow2(bytesperline, 8); + npixels = (bytesperline * 8) / bitsperpixel; + p = pixels; + while (--npixels >= 0) +@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE * const ifP, + } + + /* BytesPerLine should be >= BitsPerPixel * cols / 8 */ ++ overflow2(BytesPerLine, 8); + rawcols = BytesPerLine * 8 / BitsPerPixel; + if (headerCols > rawcols) { + pm_message("warning - BytesPerLine = %d, " +diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c +--- netpbm-10.47.04/converter/ppm/picttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/picttoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -1,3 +1,5 @@ ++#error "Unfixable. Don't ship me" ++ + /* + * picttoppm.c -- convert a MacIntosh PICT file to PPM format. + * +diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c +--- netpbm-10.47.04/converter/ppm/pjtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/pjtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -127,19 +127,21 @@ main(argc, argv) + case 'V': /* send plane */ + case 'W': /* send last plane */ + if (rows == -1 || r >= rows || image == NULL) { +- if (rows == -1 || r >= rows) ++ if (rows == -1 || r >= rows) { ++ overflow_add(rows, 100); + rows += 100; ++ } + if (image == NULL) { +- MALLOCARRAY(image, rows * planes); +- MALLOCARRAY(imlen, rows * planes); ++ image = (unsigned char **) ++ malloc3(rows , planes , sizeof(unsigned char *)); ++ imlen = (int *) malloc3(rows , planes, sizeof(int)); + } + else { ++ overflow2(rows,planes); + image = (unsigned char **) +- realloc(image, +- rows * planes * ++ realloc2(image, rows * planes, + sizeof(unsigned char *)); +- imlen = (int *) +- realloc(imlen, rows * planes * sizeof(int)); ++ imlen = (int *) realloc2(imlen, rows * planes, sizeof(int)); + } + } + if (image == NULL || imlen == NULL) +@@ -212,8 +214,10 @@ main(argc, argv) + for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2) + for (cmd = image[p + r * planes][c], + val = image[p + r * planes][c+1]; +- cmd >= 0 && i < newcols; cmd--, i++) ++ cmd >= 0 && i < newcols; cmd--, i++) { + buf[i] = val; ++ overflow_add(i, 1); ++ } + cols = cols > i ? cols : i; + free(image[p + r * planes]); + /* +@@ -224,6 +228,7 @@ main(argc, argv) + image[p + r * planes] = (unsigned char *) realloc(buf, i); + } + } ++ overflow2(cols, 8); + cols *= 8; + } + +diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c +--- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c 2009-10-21 15:09:33.000000000 +0200 +@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva + + int index; + ++ overflow_add(maxval, 1); + MALLOCARRAY_NOFAIL(mult299 , maxval+1); + MALLOCARRAY_NOFAIL(mult587 , maxval+1); + MALLOCARRAY_NOFAIL(mult114 , maxval+1); +diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c +--- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtoicr.c 2009-10-21 15:09:33.000000000 +0200 +@@ -169,7 +169,7 @@ char* argv[]; + + if (rleflag) { + pm_message("sending run-length encoded picture data ..." ); +- testimage = (char*) malloc(rows*cols); ++ testimage = (char*) malloc2(rows, cols); + p = testimage; + for (i=0; i>3) * sizeof(int32 *); + int xsz = (Fsize_x>>3); +- ++ ++ overflow2((Fsize_y>>3), sizeof(int32 *)); + needs_init = FALSE; + for (y=0; y<3; y++) { + varDiff[y] = ratio[y] = total[y] = 0.0; +@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren + fprintf(stderr, "Out of memory in BlockComputeSNR\n"); + exit(-1); + } ++ overflow2(xsz,4); + for (y = 0; y < ySize[0]>>3; y++) { + SignalY[y] = (int32 *) calloc(xsz,4); + SignalCr[y] = (int32 *) calloc(xsz,4); +diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c +--- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c 2009-10-21 15:09:33.000000000 +0200 +@@ -2161,7 +2161,9 @@ DecodeServer(int const numInput + const char * error; + + /* should keep list of port numbers to notify when frames become ready */ +- ++ ++ overflow2(numInputFiles, sizeof(int)); ++ overflow2(numInputFiles, sizeof(boolean)); + ready = (boolean *) calloc(numInputFiles, sizeof(boolean)); + waitMachine = (int *) calloc(numInputFiles, sizeof(int)); + waitPort = (int *) malloc(numMachines*sizeof(int)); +diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c +--- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c 2009-10-21 15:09:33.000000000 +0200 +@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co + int const max_search = max(searchRangeP, searchRangeB); + + int index; +- ++ ++ overflow2(searchRangeP, 2); ++ overflow2(searchRangeB, 2); ++ overflow_add(searchRangeP*2, 3); ++ overflow_add(searchRangeB*2, 3); ++ overflow2(2*searchRangeB+3, sizeof(int)); ++ overflow2(2*searchRangeP+3, sizeof(int)); ++ + pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *)); + bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *)); + bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *)); +@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer) + int *columnTotals; + int rowTotal; + ++ overflow2(searchRangeP, 2); ++ overflow_add(searchRangeP*2, 3); ++ overflow2(searchRangeP*2+3, sizeof(int)); + columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int)); + + #ifdef COMPLETE_DISPLAY +@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer) + + fprintf(fpointer, "B-frame Backwards:\n"); + ++ overflow2(searchRangeB, 2); ++ overflow_add(searchRangeB*2, 3); ++ overflow2(searchRangeB*2+3, sizeof(int)); + columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); + + #ifdef COMPLETE_DISPLAY +@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer) + + fprintf(fpointer, "B-frame Forwards:\n"); + ++ overflow2(searchRangeB, 2); ++ overflow_add(searchRangeB*2, 3); ++ overflow2(searchRangeB*2+3, sizeof(int)); + columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int)); + + #ifdef COMPLETE_DISPLAY +diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c +--- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c 2009-10-21 15:09:33.000000000 +0200 +@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval) + } + table_maxval = maxval; + ++ overflow_add(table_maxval, 1); ++ overflow2(table_maxval+1, sizeof(float)); + mult299 = malloc((table_maxval+1)*sizeof(float)); + mult587 = malloc((table_maxval+1)*sizeof(float)); + mult114 = malloc((table_maxval+1)*sizeof(float)); +diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c +--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtopcx.c 2009-10-21 15:09:33.000000000 +0200 +@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel ** cons + else Planes = 1; + } + } ++ overflow2(BitsPerPixel, cols); ++ overflow_add(BitsPerPixel * cols, 7); + BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; + MALLOCARRAY_NOFAIL(indexRow, cols); + MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); +diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c +--- netpbm-10.47.04/converter/ppm/ppmtopict.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtopict.c 2009-10-21 15:09:33.000000000 +0200 +@@ -245,6 +245,8 @@ char *argv[]; + putShort(stdout, 0); /* mode */ + + /* Finally, write out the data. */ ++ overflow_add(cols/MAX_COUNT, 1); ++ overflow_add(cols, cols/MAX_COUNT+1); + packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1)); + oc = 0; + for (row = 0; row < rows; row++) +diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c +--- netpbm-10.47.04/converter/ppm/ppmtopj.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtopj.c 2009-10-21 15:09:33.000000000 +0200 +@@ -179,6 +179,7 @@ char *argv[]; + pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); + + pm_close( ifp ); ++ overflow2(cols,2); + obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); + cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); + +diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c +--- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c 2009-10-21 15:43:31.000000000 +0200 +@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) { + pm_error("image too large; reduce with ppmscale"); + if (maxval > PCL_MAXVAL) + pm_error("color range too large; reduce with ppmcscale"); ++ if (cols < 0 || rows < 0) ++ pm_error("negative size is not possible"); + + /* Figure out the colormap. */ + pm_message("Computing colormap..."); +@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) { + case 0: /* direct mode (no palette) */ + bpp = bitsperpixel(maxval); /* bits per pixel */ + bpg = bpp; bpb = bpp; ++ overflow2(bpp, 3); ++ overflow_add(bpp*3, 7); + bpp = (bpp*3+7)>>3; /* bytes per pixel now */ + bpr = (bpp<<3)-bpg-bpb; + bpp *= cols; /* bytes per row now */ +@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) { + case 3: case 7: pclindex++; + default: + bpp = 8/pclindex; ++ overflow_add(cols, bpp); ++ if(bpp == 0) ++ pm_error("assert: no bpp"); + bpp = (cols+bpp-1)/bpp; /* bytes per row */ + } + } ++ overflow2(bpp,2); + inrow = (char *)malloc((unsigned)bpp); + outrow = (char *)malloc((unsigned)bpp*2); + runcnt = (signed char *)malloc((unsigned)bpp); +diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c +--- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c 2009-10-21 15:44:54.000000000 +0200 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include "pm_c_util.h" + #include "winico.h" +@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c + MALLOCARRAY_NOFAIL(rowData, rows); + icBitmap->xBytes = xBytes; + icBitmap->data = rowData; ++ overflow2(xBytes, rows); + icBitmap->size = xBytes * rows; + for (y=0;yxBytes = xBytes; + icBitmap->data = rowData; ++ overflow2(xBytes, rows); + icBitmap->size = xBytes * rows; + + for (y=0;yxBytes = xBytes; + icBitmap->data = rowData; ++ overflow2(xBytes, rows); + icBitmap->size = xBytes * rows; + + for (y=0;ybitcount = bpp; + entry->ih = createInfoHeader(entry, xorBitmap, andBitmap); + entry->colors = palette->colors; ++ overflow2(4, entry->color_count); ++ overflow_add(xorBitmap->size, andBitmap->size); ++ overflow_add(xorBitmap->size + andBitmap->size, 40); ++ overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count); + entry->size_in_bytes = + xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); + if (verbose) +diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c +--- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int + unsigned int i; + + /* Allocate memory for printed number. Abort if error. */ ++ overflow_add(digits, 1); + if (!(str = (char *) malloc(digits + 1))) + pm_error("out of memory"); + +@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, + unsigned int charsPerPixel; + unsigned int xpmMaxval; + ++ if (includeTransparent) overflow_add(ncolors, 1); + MALLOCARRAY(cmap, cmapSize); + if (cmapP == NULL) + pm_error("Out of memory allocating %u bytes for a color map.", +diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c +--- netpbm-10.47.04/converter/ppm/qrttoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/qrttoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -46,7 +46,7 @@ main( argc, argv ) + + ppm_writeppminit( stdout, cols, rows, maxval, 0 ); + pixelrow = ppm_allocrow( cols ); +- buf = (unsigned char *) malloc( 3 * cols ); ++ buf = (unsigned char *) malloc2( 3 , cols ); + if ( buf == (unsigned char *) 0 ) + pm_error( "out of memory" ); + +diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c +--- netpbm-10.47.04/converter/ppm/sldtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/sldtoppm.c 2009-10-21 15:44:11.000000000 +0200 +@@ -455,6 +455,8 @@ slider(slvecfn slvec, + + /* Allocate image buffer and clear it to black. */ + ++ overflow_add(ixdots,1); ++ overflow_add(iydots,1); + pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); + PPM_ASSIGN(rgbcolor, 0, 0, 0); + ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, +diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c +--- netpbm-10.47.04/converter/ppm/ximtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/ximtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp, + header->bits_channel = atoi(a_head.bits_per_channel); + header->alpha_flag = atoi(a_head.alpha_channel); + if (strlen(a_head.author)) { ++ overflow_add(strlen(a_head.author),1); + if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1, + 1))) { + pm_message("ReadXimHeader: can't calloc author string" ); +@@ -126,6 +127,7 @@ ReadXimHeader(FILE * const in_fp, + strncpy(header->author, a_head.author, strlen(a_head.author)); + } + if (strlen(a_head.date)) { ++ overflow_add(strlen(a_head.date),1); + if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){ + pm_message("ReadXimHeader: can't calloc date string" ); + return(0); +@@ -134,6 +136,7 @@ ReadXimHeader(FILE * const in_fp, + strncpy(header->date, a_head.date, strlen(a_head.date)); + } + if (strlen(a_head.program)) { ++ overflow_add(strlen(a_head.program),1); + if (!(header->program = calloc( + (unsigned int)strlen(a_head.program) + 1, 1))) { + pm_message("ReadXimHeader: can't calloc program string" ); +@@ -160,6 +163,7 @@ ReadXimHeader(FILE * const in_fp, + if (header->nchannels == 3 && header->bits_channel == 8) + header->ncolors = 0; + else if (header->nchannels == 1 && header->bits_channel == 8) { ++ overflow2(header->ncolors, sizeof(Color)); + header->colors = (Color *)calloc((unsigned int)header->ncolors, + sizeof(Color)); + if (header->colors == NULL) { +diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c +--- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/xpmtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c + &ncolors, colorsP, &ptab); + *transparentP = -1; /* No transparency in version 1 */ + } ++ overflow2(*widthP, *heightP); + totalpixels = *widthP * *heightP; + MALLOCARRAY(*dataP, totalpixels); + if (*dataP == NULL) +diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c +--- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/ppm/yuvtoppm.c 2009-10-21 15:09:33.000000000 +0200 +@@ -72,6 +72,7 @@ main(argc, argv) + + ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); + pixrow = ppm_allocrow(cols); ++ overflow_add(cols, 1); + MALLOCARRAY(yuvbuf, (cols+1)/2); + if (yuvbuf == NULL) + pm_error("Unable to allocate YUV buffer for %d columns.", cols); +diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c +--- netpbm-10.47.04/editor/pamcut.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pamcut.c 2009-10-21 15:29:36.000000000 +0200 +@@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP + + outpam = inpam; /* Initial value -- most fields should be same */ + outpam.file = ofP; ++ overflow_add(rightcol, 1); ++ overflow_add(bottomrow, 1); + outpam.width = rightcol - leftcol + 1; + outpam.height = bottomrow - toprow + 1; + +diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c +--- netpbm-10.47.04/editor/pbmpscale.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pbmpscale.c 2009-10-21 15:27:21.000000000 +0200 +@@ -110,6 +110,7 @@ main(int argc, char ** argv) { + inrow[0] = inrow[1] = inrow[2] = NULL; + pbm_readpbminit(ifP, &columns, &rows, &format) ; + ++ overflow2(columns, scale); + outrow = pbm_allocrow(columns*scale) ; + MALLOCARRAY(flags, columns); + if (flags == NULL) +diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c +--- netpbm-10.47.04/editor/pbmreduce.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pbmreduce.c 2009-10-21 15:26:13.000000000 +0200 +@@ -94,6 +94,7 @@ main( argc, argv ) + if (halftone == QT_FS) { + unsigned int col; + /* Initialize Floyd-Steinberg. */ ++ overflow_add(newcols, 2); + MALLOCARRAY(thiserr, newcols + 2); + MALLOCARRAY(nexterr, newcols + 2); + if (thiserr == NULL || nexterr == NULL) +diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c +--- netpbm-10.47.04/editor/pnmgamma.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmgamma.c 2009-10-21 15:09:34.000000000 +0200 +@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction + xelval ** const btableP) { + + /* Allocate space for the tables. */ ++ overflow_add(maxval, 1); + MALLOCARRAY(*rtableP, maxval+1); + MALLOCARRAY(*gtableP, maxval+1); + MALLOCARRAY(*btableP, maxval+1); +diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c +--- netpbm-10.47.04/editor/pnmhisteq.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmhisteq.c 2009-10-21 15:09:34.000000000 +0200 +@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const * + unsigned int pixelCount; + unsigned int * lumahist; + ++ overflow_add(maxval, 1); + MALLOCARRAY(lumahist, maxval + 1); + if (lumahist == NULL) + pm_error("Out of storage allocating array for %u histogram elements", +diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh +--- netpbm-10.47.04/editor/pnmindex.csh.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmindex.csh 2009-10-21 15:09:34.000000000 +0200 +@@ -1,5 +1,8 @@ + #!/bin/csh -f + # ++echo "Unsafe code, needs debugging, do not ship" ++exit 1 ++# + # pnmindex - build a visual index of a bunch of anymaps + # + # Copyright (C) 1991 by Jef Poskanzer. +diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c +--- netpbm-10.47.04/editor/pnmpad.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmpad.c 2009-10-21 15:33:51.000000000 +0200 +@@ -527,6 +527,8 @@ main(int argc, const char ** argv) { + + computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); + ++ overflow_add(cols, lpad); ++ overflow_add(cols + lpad, rpad); + newcols = cols + lpad + rpad; + + if (PNM_FORMAT_TYPE(format) == PBM_TYPE) +diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c +diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c +--- netpbm-10.47.04/editor/pnmremap.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmremap.c 2009-10-21 15:28:20.000000000 +0200 +@@ -408,7 +408,7 @@ initFserr(struct pam * const pamP, + unsigned int plane; + + unsigned int const fserrSize = pamP->width + 2; +- ++ overflow_add(pamP->width, 2); + fserrP->width = pamP->width; + + MALLOCARRAY(fserrP->thiserr, pamP->depth); +@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st + + int col; + ++ overflow_add(pamP->width, 2); + for (col = 0; col < pamP->width + 2; ++col) { + unsigned int plane; + for (plane = 0; plane < pamP->depth; ++plane) +diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c +--- netpbm-10.47.04/editor/pnmscalefixed.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmscalefixed.c 2009-10-21 15:09:34.000000000 +0200 +@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c + const int rows, const int cols, + int * newrowsP, int * newcolsP) { + ++ overflow2(rows, cols); ++ + if (cmdline.pixels) { + if (rows * cols <= cmdline.pixels) { + *newrowsP = rows; +@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c + + if (*newcolsP < 1) *newcolsP = 1; + if (*newrowsP < 1) *newrowsP = 1; ++ ++ overflow2(*newcolsP, *newrowsP); + } + + +@@ -443,6 +447,9 @@ main(int argc, char **argv ) { + unfilled. We can address that by stretching, whereas the other + case would require throwing away some of the input. + */ ++ ++ overflow2(newcols, SCALE); ++ overflow2(newrows, SCALE); + sxscale = SCALE * newcols / cols; + syscale = SCALE * newrows / rows; + +diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c +--- netpbm-10.47.04/editor/pnmshear.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmshear.c 2009-10-21 15:31:26.000000000 +0200 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include "pm_c_util.h" + #include "ppm.h" +@@ -236,6 +237,11 @@ main(int argc, char * argv[]) { + + shearfac = fabs(tan(cmdline.angle)); + ++ if(rows * shearfac >= INT_MAX-1) ++ pm_error("image too large"); ++ ++ overflow_add(rows * shearfac, cols+1); ++ + newcols = rows * shearfac + cols + 0.999999; + + pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0); +diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c +--- netpbm-10.47.04/editor/ppmdither.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/ppmdither.c 2009-10-21 15:09:34.000000000 +0200 +@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim) + (dith_dim * sizeof(int *)) + /* pointers */ + (dith_dim * dith_dim * sizeof(int)); /* data */ + ++ overflow2(dith_dim, sizeof(int *)); ++ overflow3(dith_dim, dith_dim, sizeof(int)); ++ overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int)); + dith_mat = (unsigned int **) malloc(dith_mat_sz); + + if (dith_mat == NULL) +@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power + if (dith_nb < 2) + pm_error("too few shades for blue, minimum of 2"); + +- MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb); ++ overflow2(dith_nr, dith_ng); ++ *colormapP = malloc3(dith_nr * dith_ng, dith_nb, sizeof(pixel)); + if (*colormapP == NULL) + pm_error("Unable to allocate space for the color lookup table " + "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb); +diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c +--- netpbm-10.47.04/editor/specialty/pamoil.c.security 2009-10-21 13:38:56.000000000 +0200 ++++ netpbm-10.47.04/editor/specialty/pamoil.c 2009-10-21 15:09:33.000000000 +0200 +@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { + tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); + pm_close(ifp); + ++ overflow_add(inpam.maxval, 1); + MALLOCARRAY(hist, inpam.maxval + 1); + if (hist == NULL) + pm_error("Unable to allocate memory for histogram."); +diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c +--- netpbm-10.47.04/generator/pbmpage.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/generator/pbmpage.c 2009-10-21 15:09:34.000000000 +0200 +@@ -170,6 +170,9 @@ outputPbm(FILE * const file, + /* We round the allocated row space up to a multiple of 8 so the ugly + fast code below can work. + */ ++ ++ overflow_add(bitmap.Width, 7); ++ + pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8); + + bitmap_cursor = 0; +diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c +--- netpbm-10.47.04/generator/pbmtext.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/generator/pbmtext.c 2009-10-21 15:23:15.000000000 +0200 +@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char ** + + for (i = 1; i < argc; ++i) { + if (i > 1) { ++ overflow_add(totaltextsize, 1); + totaltextsize += 1; + text = realloc(text, totaltextsize); + if (text == NULL) + pm_error("out of memory allocating space for input text"); + strcat(text, " "); + } ++ overflow_add(totaltextsize, strlen(argv[i])); + totaltextsize += strlen(argv[i]); + text = realloc(text, totaltextsize); + if (text == NULL) +@@ -711,6 +713,7 @@ getText(const char cmdline_text + pm_error("A line of input text is longer than %u characters." + "Cannot process.", sizeof(buf)-1); + if (lineCount >= maxlines) { ++ overflow2(maxlines, 2); + maxlines *= 2; + REALLOCARRAY(text_array, maxlines); + if (text_array == NULL) +@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) { + hmargin = fontP->maxwidth; + } else { + vmargin = fontP->maxheight; ++ overflow2(2, fontP->maxwidth); + hmargin = 2 * fontP->maxwidth; + } + } +diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c +--- netpbm-10.47.04/generator/pgmcrater.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/generator/pgmcrater.c 2009-10-21 15:09:34.000000000 +0200 +@@ -130,7 +130,7 @@ static void gencraters() + /* Acquire the elevation array and initialize it to mean + surface elevation. */ + +- MALLOCARRAY(aux, SCRX * SCRY); ++ aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short)); + if (aux == NULL) + pm_error("out of memory allocating elevation array"); + +diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c +--- netpbm-10.47.04/generator/pgmkernel.c.security 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/generator/pgmkernel.c 2009-10-21 15:09:34.000000000 +0200 +@@ -68,7 +68,7 @@ main ( argc, argv ) + kycenter = (fysize - 1) / 2.0; + ixsize = fxsize + 0.999; + iysize = fysize + 0.999; +- MALLOCARRAY(fkernel, ixsize * iysize); ++ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double)); + for (i = 0; i < iysize; i++) + for (j = 0; j < ixsize; j++) { + fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) +diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c +--- netpbm-10.47.04/lib/libpam.c.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/libpam.c 2009-10-21 15:09:34.000000000 +0200 +@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam + int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); + tuple * tuplerow; + +- tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple)); ++ overflow_add(sizeof(tuple *), bytesPerTuple); ++ tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple); + + if (tuplerow != NULL) { + /* Now we initialize the pointers to the individual tuples +diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c +--- netpbm-10.47.04/lib/libpammap.c.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/libpammap.c 2009-10-21 15:09:34.000000000 +0200 +@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const + */ + struct tupleint_list_item * retval; + ++ overflow2(pamP->depth, sizeof(sample)); ++ overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample)); + unsigned int const size = + sizeof(*retval) - sizeof(retval->tupleint.tuple) + + pamP->depth * sizeof(sample); +diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c +--- netpbm-10.47.04/lib/libpbm1.c.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/libpbm1.c 2009-10-21 15:09:34.000000000 +0200 +@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che + pm_message("pm_filepos passed to pm_check() is %u bytes", + sizeof(pm_filepos)); + #endif ++ overflow2(bytes_per_row, rows); + pm_check(file, check_type, need_raster_size, retval_p); + } + } +diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c +--- netpbm-10.47.04/lib/libpbmvms.c.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/libpbmvms.c 2009-10-21 15:09:34.000000000 +0200 +@@ -1,3 +1,5 @@ ++#warning "NOT AUDITED" ++ + /*************************************************************************** + This file contains library routines needed to build Netpbm for VMS. + However, as of 2000.05.26, when these were split out of libpbm1.c +diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c +--- netpbm-10.47.04/lib/libpm.c.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/libpm.c 2009-10-21 15:09:34.000000000 +0200 +@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) + } + + ++/* ++ * Maths wrapping ++ */ ++ ++void __overflow2(int a, int b) ++{ ++ if(a < 0 || b < 0) ++ pm_error("object too large"); ++ if(b == 0) ++ return; ++ if(a > INT_MAX / b) ++ pm_error("object too large"); ++} ++ ++void overflow3(int a, int b, int c) ++{ ++ overflow2(a,b); ++ overflow2(a*b, c); ++} ++ ++void overflow_add(int a, int b) ++{ ++ if( a > INT_MAX - b) ++ pm_error("object too large"); ++} ++ ++void *malloc2(int a, int b) ++{ ++ overflow2(a, b); ++ if(a*b == 0) ++ pm_error("Zero byte allocation"); ++ return malloc(a*b); ++} ++ ++void *malloc3(int a, int b, int c) ++{ ++ overflow3(a, b, c); ++ if(a*b*c == 0) ++ pm_error("Zero byte allocation"); ++ return malloc(a*b*c); ++} ++ ++void *realloc2(void * a, int b, int c) ++{ ++ overflow2(b, c); ++ if(b*c == 0) ++ pm_error("Zero byte allocation"); ++ return realloc(a, b*c); ++} + +diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h +--- netpbm-10.47.04/lib/pm.h.security 2009-10-21 13:39:00.000000000 +0200 ++++ netpbm-10.47.04/lib/pm.h 2009-10-21 15:09:34.000000000 +0200 +@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg); + #endif + + ++void *malloc2(int, int); ++void *malloc3(int, int, int); ++#define overflow2(a,b) __overflow2(a,b) ++void __overflow2(int, int); ++void overflow3(int, int, int); ++void overflow_add(int, int); ++ + #endif +diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c +--- netpbm-10.47.04/other/pnmcolormap.c.security 2009-10-21 13:38:54.000000000 +0200 ++++ netpbm-10.47.04/other/pnmcolormap.c 2009-10-21 15:09:34.000000000 +0200 +@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP + pamP->width = intsqrt; + else + pamP->width = intsqrt + 1; ++ overflow_add(intsqrt, 1); + } + { + unsigned int const intQuotient = colormap.size / pamP->width; +diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README +--- netpbm-10.47.04/urt/README.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/README 2009-10-21 15:09:34.000000000 +0200 +@@ -18,3 +18,8 @@ in its initializer in the original. But + defines stdout as a variable, so that wouldn't compile. So I changed + it to NULL and added a line to rle_hdr_init to set that field to + 'stdout' dynamically. 2000.06.02 BJH. ++ ++Redid the code to check for maths overflows and other crawly horrors. ++Removed pipe through and compress support (unsafe) ++ ++Alan Cox +diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c +--- netpbm-10.47.04/urt/rle_addhist.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle_addhist.c 2009-10-21 15:09:34.000000000 +0200 +@@ -14,6 +14,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_addhist.c - Add to the HISTORY comment in header +@@ -76,13 +78,19 @@ rle_addhist(char * argv[], + return; + + length = 0; +- for (i = 0; argv[i]; ++i) ++ for (i = 0; argv[i]; ++i) { ++ overflow_add(length, strlen(argv[i])); ++ overflow_add(length+1, strlen(argv[i])); + length += strlen(argv[i]) +1; /* length of each arg plus space. */ ++ } + + time(&temp); + timedate = ctime(&temp); + length += strlen(timedate); /* length of date and time in ASCII. */ + ++ overflow_add(strlen(padding), 4); ++ overflow_add(strlen(histoire), strlen(padding) + 4); ++ overflow_add(length, strlen(histoire) + strlen(padding) + 4); + length += strlen(padding) + 3 + strlen(histoire) + 1; + /* length of padding, "on " and length of history name plus "="*/ + if (in_hdr) /* if we are interested in the old comments... */ +@@ -90,9 +98,12 @@ rle_addhist(char * argv[], + else + old = NULL; + +- if (old && *old) ++ if (old && *old) { ++ overflow_add(length, strlen(old)); + length += strlen(old); /* add length if there. */ ++ } + ++ overflow_add(length, 1); + ++length; /*Cater for the null. */ + + MALLOCARRAY(newc, length); +diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c +--- netpbm-10.47.04/urt/rle_getrow.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle_getrow.c 2009-10-21 15:09:34.000000000 +0200 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_getrow.c - Read an RLE file in. +@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) { + register char * cp; + + VAXSHORT( comlen, infile ); /* get comment length */ ++ overflow_add(comlen, 1); + evenlen = (comlen + 1) & ~1; /* make it even */ + if ( evenlen ) + { +diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c +--- netpbm-10.47.04/urt/rle_hdr.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle_hdr.c 2009-10-21 15:09:34.000000000 +0200 +@@ -14,6 +14,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_hdr.c - Functions to manipulate rle_hdr structures. +@@ -79,7 +81,10 @@ int img_num; + /* Fill in with copies of the strings. */ + if ( the_hdr->cmd != pgmname ) + { +- char *tmp = (char *)malloc( strlen( pgmname ) + 1 ); ++ char *tmp ; ++ ++ overflow_add(strlen(pgmname), 1); ++ tmp = malloc( strlen( pgmname ) + 1 ); + RLE_CHECK_ALLOC( pgmname, tmp, 0 ); + strcpy( tmp, pgmname ); + the_hdr->cmd = tmp; +@@ -87,7 +92,9 @@ int img_num; + + if ( the_hdr->file_name != fname ) + { +- char *tmp = (char *)malloc( strlen( fname ) + 1 ); ++ char *tmp; ++ overflow_add(strlen(fname), 1); ++ tmp = malloc( strlen( fname ) + 1 ); + RLE_CHECK_ALLOC( pgmname, tmp, 0 ); + strcpy( tmp, fname ); + the_hdr->file_name = tmp; +@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; + if ( to_hdr->bg_color ) + { + int size = to_hdr->ncolors * sizeof(int); ++ overflow2(to_hdr->ncolors, sizeof(int)); + to_hdr->bg_color = (int *)malloc( size ); + RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); + memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); +@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; + if ( to_hdr->cmap ) + { + int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); +- to_hdr->cmap = (rle_map *)malloc( size ); ++ to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<cmaplen, sizeof(rle_map)); + RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); + memcpy( to_hdr->cmap, from_hdr->cmap, size ); + } +@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; + int size = 0; + CONST_DECL char **cp; + for ( cp=to_hdr->comments; *cp; cp++ ) ++ { ++ overflow_add(size, 1); + size++; /* Count the comments. */ ++ } + /* Check if there are really any comments. */ + if ( size ) + { ++ overflow_add(size, 1); + size++; /* Copy the NULL pointer, too. */ ++ overflow2(size, sizeof(char *)); + size *= sizeof(char *); + to_hdr->comments = (CONST_DECL char **)malloc( size ); + RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); +diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h +--- netpbm-10.47.04/urt/rle.h.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle.h 2009-10-21 15:09:34.000000000 +0200 +@@ -14,6 +14,9 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox ++ * Header declarations needed + */ + /* + * rle.h - Global declarations for Utah Raster Toolkit RLE programs. +@@ -166,6 +169,17 @@ rle_hdr /* End of typedef. * + */ + extern rle_hdr rle_dflt_hdr; + ++/* ++ * Provided by pm library ++ */ ++ ++extern void overflow_add(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); ++extern void overflow3(int, int, int); ++extern void *malloc2(int, int); ++extern void *malloc3(int, int, int); ++extern void *realloc2(void *, int, int); + + /* Declare RLE library routines. */ + +diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c +--- netpbm-10.47.04/urt/rle_open_f.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle_open_f.c 2009-10-21 15:15:38.000000000 +0200 +@@ -163,64 +163,7 @@ dealWithSubprocess(const char * const f + bool * const noSubprocessP, + const char ** const errorP) { + +-#ifdef NO_OPEN_PIPES + *noSubprocessP = TRUE; +-#else +- const char *cp; +- +- reapChildren(catchingChildrenP, pids); +- +- /* Real file, not stdin or stdout. If name ends in ".Z", +- * pipe from/to un/compress (depending on r/w mode). +- * +- * If it starts with "|", popen that command. +- */ +- +- cp = file_name + strlen(file_name) - 2; +- /* Pipe case. */ +- if (file_name[0] == '|') { +- pid_t thepid; /* PID from my_popen */ +- +- *noSubprocessP = FALSE; +- +- *fpP = my_popen(file_name + 1, mode, &thepid); +- if (*fpP == NULL) +- *errorP = "%s: can't invoke <<%s>> for %s: "; +- else { +- /* One more child to catch, eventually. */ +- if (*catchingChildrenP < MAX_CHILDREN) +- pids[(*catchingChildrenP)++] = thepid; +- } +- } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) { +- /* Compress case. */ +- pid_t thepid; /* PID from my_popen. */ +- const char * command; +- +- *noSubprocessP = FALSE; +- +- if (*mode == 'w') +- asprintfN(&command, "compress > %s", file_name); +- else if (*mode == 'a') +- asprintfN(&command, "compress >> %s", file_name); +- else +- asprintfN(&command, "compress -d < %s", file_name); +- +- *fpP = my_popen(command, mode, &thepid); +- +- if (*fpP == NULL) +- *errorP = "%s: can't invoke 'compress' program, " +- "trying to open %s for %s"; +- else { +- /* One more child to catch, eventually. */ +- if (*catchingChildrenP < MAX_CHILDREN) +- pids[(*catchingChildrenP)++] = thepid; +- } +- strfree(command); +- } else { +- *noSubprocessP = TRUE; +- *errorP = NULL; +- } +-#endif + } + + +diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c +--- netpbm-10.47.04/urt/rle_putcom.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/rle_putcom.c 2009-10-21 15:09:34.000000000 +0200 +@@ -14,6 +14,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_putcom.c - Add a picture comment to the header struct. +@@ -98,12 +100,14 @@ rle_putcom(const char * const value, + const char * v; + const char ** old_comments; + int i; +- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) ++ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) { ++ overflow_add(i, 1); + if (match(value, *cp) != NULL) { + v = *cp; + *cp = value; + return v; + } ++ } + /* Not found */ + /* Can't realloc because somebody else might be pointing to this + * comments block. Of course, if this were true, then the +diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c +--- netpbm-10.47.04/urt/Runput.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/Runput.c 2009-10-21 15:09:34.000000000 +0200 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * Runput.c - General purpose Run Length Encoding. +@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) + if ( the_hdr->background != 0 ) + { + register int i; +- register rle_pixel *background = +- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); ++ register rle_pixel *background; + register int *bg_color; ++ ++ overflow_add(the_hdr->ncolors,1); ++ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); + /* + * If even number of bg color bytes, put out one more to get to + * 16 bit boundary. +@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) + /* Big-endian machines are harder */ + register int i, nmap = (1 << the_hdr->cmaplen) * + the_hdr->ncmap; +- register char *h_cmap = (char *)malloc( nmap * 2 ); ++ register char *h_cmap = (char *)malloc2( nmap, 2 ); + if ( h_cmap == NULL ) + { + fprintf( stderr, +diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c +--- netpbm-10.47.04/urt/scanargs.c.security 2009-10-21 13:39:11.000000000 +0200 ++++ netpbm-10.47.04/urt/scanargs.c 2009-10-21 15:09:34.000000000 +0200 +@@ -38,6 +38,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + + #include "rle.h" +@@ -65,8 +67,8 @@ typedef int *ptr; + /* + * Storage allocation macros + */ +-#define NEW( type, cnt ) (type *) malloc( (cnt) * sizeof( type ) ) +-#define RENEW( type, ptr, cnt ) (type *) realloc( ptr, (cnt) * sizeof( type ) ) ++#define NEW( type, cnt ) (type *) malloc2( (cnt) , sizeof( type ) ) ++#define RENEW( type, ptr, cnt ) (type *) realloc2( ptr, (cnt), sizeof( type ) ) + + #if defined(c_plusplus) && !defined(USE_PROTOTYPES) + #define USE_PROTOTYPES diff --git a/netpbm-security-scripts.patch b/netpbm-security-scripts.patch new file mode 100644 index 0000000..47a426b --- /dev/null +++ b/netpbm-security-scripts.patch @@ -0,0 +1,422 @@ +diff -up netpbm-10.47.04/converter/other/anytopnm.security2 netpbm-10.47.04/converter/other/anytopnm +--- netpbm-10.47.04/converter/other/anytopnm.security2 2009-10-21 13:39:06.000000000 +0200 ++++ netpbm-10.47.04/converter/other/anytopnm 2009-10-21 14:51:49.000000000 +0200 +@@ -510,10 +510,7 @@ else + inputFile="-" + fi + +-tempdir="${TMPDIR-/tmp}/anytopnm.$$" +-mkdir -m 0700 $tempdir || \ +- { echo "Could not create temporary file. Exiting."; exit 1;} +-trap 'rm -rf $tempdir' 0 ++tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1 + + # Take out all spaces + # Find the filename extension for last-ditch efforts later +@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then + echo "$progname: unknown file type. " \ + "'file' says mime type is '$mimeType', " 1>&2 + echo "type description is '$typeDescription'" 1>&2 ++ if [ -d "$tempdir" ] ; then ++ rm -rf "$tempdir" ++ fi ++ + exit 1 + fi + + convertIt $file $filetype + ++if [ -d "$tempdir" ] ; then ++ rm -rf "$tempdir" ++fi ++ + exit 0 +diff -up netpbm-10.47.04/editor/pamstretch-gen.security2 netpbm-10.47.04/editor/pamstretch-gen +--- netpbm-10.47.04/editor/pamstretch-gen.security2 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pamstretch-gen 2009-10-21 14:53:28.000000000 +0200 +@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then + exit 1 + fi + +-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$" +-mkdir -m 0700 $tempdir || \ +- { echo "Could not create temporary file. Exiting."; exit 1;} ++tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1 + trap 'rm -rf $tempdir' 0 1 3 15 + + tempfile=$tempdir/pnmig +diff -up netpbm-10.47.04/editor/pnmmargin.security2 netpbm-10.47.04/editor/pnmmargin +--- netpbm-10.47.04/editor/pnmmargin.security2 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/pnmmargin 2009-10-21 14:55:40.000000000 +0200 +@@ -11,15 +11,11 @@ + # documentation. This software is provided "as is" without express or + # implied warranty. + +-tempdir="${TMPDIR-/tmp}/pnmmargin.$$" +-mkdir -m 0700 $tempdir || \ +- { echo "Could not create temporary file. Exiting." 1>&2; exit 1;} +-trap 'rm -rf $tempdir' 0 1 3 15 +- +-tmp1=$tempdir/pnmm1 +-tmp2=$tempdir/pnmm2 +-tmp3=$tempdir/pnmm3 +-tmp4=$tempdir/pnmm4 ++tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1 ++tmp1="$tmpdir/tmp1" ++tmp2="$tmpdir/tmp2" ++tmp3="$tmpdir/tmp3" ++tmp4="$tmpdir/tmp4" + + color="-gofigure" + plainopt="" +@@ -43,6 +39,9 @@ while true ; do + shift + if [ ! ${1-""} ] ; then + echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 ++ if [ -d "$tmpdir" ]; then ++ rm -rf "$tmpdir" ++ fi + exit 1 + fi + color="$1" +@@ -50,6 +49,9 @@ while true ; do + ;; + -* ) + echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 ++ if [ -d "$tmpdir" ]; then ++ rm -rf "$tmpdir" ++ fi + exit 1 + ;; + * ) +@@ -60,6 +62,9 @@ done + + if [ ! ${1-""} ] ; then + echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 ++ if [ -d "$tmpdir" ]; then ++ rm -rf "$tmpdir" ++ fi + exit 1 + fi + size="$1" +@@ -67,6 +72,9 @@ shift + + if [ ${2-""} ] ; then + echo "usage: $0 [-white|-black|-color ] [pnmfile]" 1>&2 ++ if [ -d "$tmpdir" ]; then ++ rm -rf "$tmpdir" ++ fi + exit 1 + fi + +@@ -103,6 +111,6 @@ else + pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3 + fi + +- +- +- ++if [ -d "$tmpdir" ]; then ++ rm -rf "$tmpdir" ++fi +diff -up netpbm-10.47.04/editor/ppmfade.security2 netpbm-10.47.04/editor/ppmfade +--- netpbm-10.47.04/editor/ppmfade.security2 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/ppmfade 2009-10-21 15:03:01.000000000 +0200 +@@ -14,6 +14,7 @@ + # + #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + use strict; ++use File::Temp "tempdir"; + + my $SPREAD = 1; + my $SHIFT = 2; +@@ -111,20 +112,26 @@ if ($first_file ne "undefined") { + + print("Frames are " . $width . "W x " . $height . "H\n"); + ++# ++# We create a tmp-directory right here ++# ++my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1); ++ ++ + if ($first_file eq "undefined") { + print "Fading from black to "; +- system("ppmmake \\#000 $width $height >junk1$$.ppm"); ++ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm"); + } else { + print "Fading from $first_file to "; +- system("cp", $first_file, "junk1$$.ppm"); ++ system("cp", $first_file, "$tmpdir/junk1$$.ppm"); + } + + if ($last_file eq "undefined") { + print "black.\n"; +- system("ppmmake \\#000 $width $height >junk2$$.ppm"); ++ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm"); + } else { + print "$last_file\n"; +- system("cp", $last_file, "junk2$$.ppm"); ++ system("cp", $last_file, "$tmpdir/junk2$$.ppm"); + } + + # +@@ -132,14 +139,14 @@ if ($last_file eq "undefined") { + # + + # Here's what our temporary files are: +-# junk1$$.ppm: The original (fade-from) image +-# junk2$$.ppm: The target (fade-from) image +-# junk3$$.ppm: The frame of the fade for the current iteration of the +-# the for loop. +-# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate +-# image to another, this is the first frame of that +-# sequence. +-# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence ++# $tmpdir/junk1$$.ppm: The original (fade-from) image ++# $tmpdir/junk2$$.ppm: The target (fade-from) image ++# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the ++# the for loop. ++# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate ++# image to another, this is the first frame of that ++# sequence. ++# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence + + my $i; # Frame number + for ($i = 1; $i <= $nframes; $i++) { +@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) { + if ($mode eq $SPREAD) { + if ($i <= 10) { + my $n = $spline20[$i] * 100; +- system("ppmspread $n junk1$$.ppm >junk3$$.ppm"); ++ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n; + $n = $spline20[$i] * 100; +- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm"); ++ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); + $n = (1-$spline20[$i-10]) * 100; +- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm"); ++ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); + $n = $spline10[$i-10]; +- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = (1-$spline20[$i-10])*100; +- system("ppmspread $n junk2$$.ppm >junk3$$.ppm"); ++ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + } elsif ($mode eq $SHIFT) { + if ($i <= 10) { + my $n = $spline20[$i] * 100; +- system("ppmshift $n junk1$$.ppm >junk3$$.ppm"); ++ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n; + $n = $spline20[$i] * 100; +- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm"); ++ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); + $n = (1-$spline20[$i-10])*100; +- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm"); ++ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); + $n = $spline10[$i-10]; +- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = (1-$spline20[$i-10]) * 100; +- system("ppmshift $n junk2$$.ppm >junk3$$.ppm"); ++ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + } elsif ($mode eq $RELIEF) { + if ($i == 1) { +- system("ppmrelief junk1$$.ppm >junk1r$$.ppm"); ++ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm"); + } + if ($i <= 10) { + my $n = $spline10[$i]; +- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n = $spline10[$i-10]; +- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = $spline10[$i-20]; +- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + if ($i == 10) { +- system("ppmrelief junk2$$.ppm >junk2r$$.ppm"); ++ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm"); + } + } elsif ($mode eq $OIL) { + if ($i == 1) { +- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk1o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk1o$$.ppm"); + } + if ($i <= 10) { + my $n = $spline10[$i]; +- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n = $spline10[$i-10]; +- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = $spline10[$i-20]; +- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + if ($i == 10) { +- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk2o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk2o$$.ppm"); + } + } elsif ($mode eq $EDGE) { + if ($i == 1) { +- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk1o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk1o$$.ppm"); + } + if ($i <= 10) { + my $n = $spline10[$i]; +- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n = $spline10[$i-10]; +- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = $spline10[$i-20]; +- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + if ($i == 10) { +- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk2o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk2o$$.ppm"); + } + } elsif ($mode eq $BENTLEY) { + if ($i == 1) { +- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk1o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk1o$$.ppm"); + } + if ($i <= 10) { + my $n = $spline10[$i]; +- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n = $spline10[$i-10]; +- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = $spline10[$i-20]; +- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } + if ($i == 10) { +- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm"); +- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . +- ">junk2o$$.ppm"); ++ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); ++ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . ++ ">$tmpdir/junk2o$$.ppm"); + } + } elsif ($mode eq $BLOCK) { + if ($i <= 10) { + my $n = 1 - 1.9*$spline20[$i]; +- system("pamscale $n junk1$$.ppm | " . +- "pamscale -width $width -height $height >junk3$$.ppm"); ++ system("pamscale $n $tmpdir/junk1$$.ppm | " . ++ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); + } elsif ($i <= 20) { + my $n = $spline10[$i-10]; +- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); ++ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + my $n = 1 - 1.9*$spline20[31-$i]; +- system("pamscale $n junk2$$.ppm | " . +- "pamscale -width $width -height $height >junk3$$.ppm"); ++ system("pamscale $n $tmpdir/junk2$$.ppm | " . ++ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); + } + if ($i == 10) { +- system("cp", "junk3$$.ppm", "junk1a$$.ppm"); +- system("pamscale $n junk2$$.ppm | " . +- "pamscale -width $width -height $height >junk2a$$.ppm"); ++ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm"); ++ system("pamscale $n $tmpdir/junk2$$.ppm | " . ++ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm"); + } + } elsif ($mode eq $MIX) { + my $fade_factor = sqrt(1/($nframes-$i+1)); +- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm"); ++ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); + } else { + print("Internal error: impossible mode value '$mode'\n"); + } + + my $outfile = sprintf("%s.%04d.ppm", $base_name, $i); +- system("cp", "junk3$$.ppm", $outfile); ++ system("cp", "$tmpdir/junk3$$.ppm", $outfile); + } + + # + # Clean up shop. + # +-system("rm junk*$$.ppm"); ++system("rm $tmpdir/junk*$$.ppm"); + + exit(0); +diff -up netpbm-10.47.04/editor/ppmquantall.security2 netpbm-10.47.04/editor/ppmquantall +--- netpbm-10.47.04/editor/ppmquantall.security2 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/ppmquantall 2009-10-21 14:52:38.000000000 +0200 +@@ -70,12 +70,8 @@ for i in ${files[@]}; do + heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`) + done + +-tempdir="${TMPDIR-/tmp}/ppmquantall.$$" +-mkdir -m 0700 $tempdir || \ +- { echo "Could not create temporary file. Exiting."; exit 1;} +-trap 'rm -rf $tempdir' 0 1 3 15 +- +-all=$tempdir/pqa.all.$$ ++all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1 ++rm -f $all + + pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all + if [ $? != 0 ]; then +diff -up netpbm-10.47.04/editor/ppmshadow.security2 netpbm-10.47.04/editor/ppmshadow +--- netpbm-10.47.04/editor/ppmshadow.security2 2009-10-21 13:38:57.000000000 +0200 ++++ netpbm-10.47.04/editor/ppmshadow 2009-10-21 14:51:02.000000000 +0200 +@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) { + + + my $tmpdir = $ENV{TMPDIR} || "/tmp"; +-my $ourtmp = "$tmpdir/ppmshadow$$"; +-mkdir($ourtmp, 0777) or +- die("Unable to create directory for temporary files '$ourtmp"); ++my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`); ++if ($? >> 8) { ++ die "Can't create directory for temporary files"; ++} + + # Process command line options + diff --git a/netpbm-svgtopam.patch b/netpbm-svgtopam.patch new file mode 100644 index 0000000..bd03f55 --- /dev/null +++ b/netpbm-svgtopam.patch @@ -0,0 +1,14 @@ +diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile +--- netpbm-10.35.67/converter/other/Makefile.svgtopam 2009-09-04 13:57:06.000000000 +0200 ++++ netpbm-10.35.67/converter/other/Makefile 2009-09-04 14:09:00.000000000 +0200 +@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE) + BINARIES += pnmtops + endif + +-ifneq ($(XML2_LIBS),NONE) +- BINARIES += svgtopam +-endif +- + MERGEBINARIES = $(BINARIES) + + EXTRA_OBJECTS = exif.o rast.o bmepsoe.o diff --git a/netpbm-time.patch b/netpbm-time.patch new file mode 100644 index 0000000..8caf944 --- /dev/null +++ b/netpbm-time.patch @@ -0,0 +1,20 @@ +--- netpbm-10.17/converter/other/fiasco/config.h.time 2001-05-28 02:43:11.000000000 +0200 ++++ netpbm-10.17/converter/other/fiasco/config.h 2003-09-08 15:23:17.000000000 +0200 +@@ -19,7 +19,7 @@ + #define STDC_HEADERS 1 + + /* Define if you can safely include both and . */ +-#define TIME_WITH_SYS_TIME 1 ++/* #undef TIME_WITH_SYS_TIME 1 */ + + /* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ +@@ -79,7 +79,7 @@ + #define HAVE_STRING_H 1 + + /* Define if you have the header file. */ +-#define HAVE_SYS_TIME_H 1 ++/* #undef HAVE_SYS_TIME_H 1 */ + + /* Define if you have the header file. */ + #define HAVE_UNISTD_H 1 diff --git a/netpbm-xwdfix.patch b/netpbm-xwdfix.patch new file mode 100644 index 0000000..88626c7 --- /dev/null +++ b/netpbm-xwdfix.patch @@ -0,0 +1,11 @@ +--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix 2006-09-18 13:24:50.000000000 +0200 ++++ netpbm-10.35/converter/other/xwdtopnm.c 2006-09-18 13:27:26.000000000 +0200 +@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) { + unsigned long const bitsToTakeMask = lsbmask[nBitsToTake]; + /* E.g. if nbitsToTake is 4, this is 0x0000000F */ + +- unsigned long bitsToTake; ++ unsigned int bitsToTake; + /* The actual bits we take, in the 'nBitsToTake' low bits */ + + assert(nBitsToTake <= 32); diff --git a/netpbm.spec b/netpbm.spec index 8b56b66..a795c38 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,6 +1,6 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.35.68 +Version: 10.47.04 Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain @@ -11,26 +11,21 @@ URL: http://netpbm.sourceforge.net/ # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide # and removing the .svn directories Source0: netpbm-%{version}.tar.xz -Patch1: netpbm-10.17-time.patch -Patch2: netpbm-9.24-strip.patch -Patch3: netpbm-10.19-message.patch -Patch4: netpbm-10.22-security2.patch -Patch6: netpbm-10.23-security.patch -Patch7: netpbm-10.24-nodoc.patch -Patch8: netpbm-10.28-gcc4.patch -Patch9: netpbm-10.27-bmptopnm.patch -Patch10: netpbm-10.28-CAN-2005-2471.patch -Patch11: netpbm-10.31-xwdfix.patch -Patch12: netpbm-10.33-ppmtompeg.patch -Patch13: netpbm-10.33-multilib.patch -Patch14: netpbm-10.34-pamscale.patch -Patch18: netpbm-10.35-glibc.patch -Patch19: netpbm-10.35-gcc43.patch -Patch20: netpbm-10.35-rgbtxt.patch -Patch22: netpbm-10.35-pnmmontagefix.patch -Patch23: netpbm-10.35-pnmtofiasco-stdin.patch -Patch24: netpbm-10.35-64bitfix.patch -Patch29: netpbm-10.35-svgtopam.patch +Patch1: netpbm-time.patch +Patch2: netpbm-message.patch +Patch3: netpbm-security-scripts.patch +Patch4: netpbm-security-code.patch +Patch5: netpbm-nodoc.patch +Patch6: netpbm-gcc4.patch +Patch7: netpbm-bmptopnm.patch +Patch8: netpbm-CAN-2005-2471.patch +Patch9: netpbm-xwdfix.patch +Patch10: netpbm-ppmtompeg.patch +Patch11: netpbm-multilib.patch +Patch12: netpbm-pamscale.patch +Patch13: netpbm-glibc.patch +Patch14: netpbm-pnmtofiasco-stdin.patch +Patch15: netpbm-svgtopam.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libX11-devel, python, jasper-devel @@ -73,25 +68,22 @@ netpbm-progs. You'll also need to install the netpbm package. %prep %setup -q %patch1 -p1 -b .time -%patch2 -p1 -b .strip -%patch3 -p1 -b .message -%patch4 -p1 -b .security2 -%patch6 -p1 -b .security -%patch7 -p1 -b .nodoc -%patch8 -p1 -b .gcc4 -%patch9 -p1 -b .bmptopnm -%patch10 -p1 -b .CAN-2005-2471 -%patch11 -p1 -b .xwdfix -%patch12 -p1 -b .ppmtompeg -%patch13 -p1 -b .multilib -%patch14 -p1 -b .pamscale -%patch18 -p1 -b .glibc -%patch19 -p1 -b .gcc43 -%patch20 -p1 -b .rgbtxt -%patch22 -p1 -b .pnmmontagefix -%patch23 -p1 -b .pnmtofiasco-stdin -%patch24 -p1 -b .64bitfix -%patch29 -p1 -b .svgtopam +%patch2 -p1 -b .message +%patch3 -p1 -b .security-scripts +%patch4 -p1 -b .security-code +%patch5 -p1 -b .nodoc +%patch6 -p1 -b .gcc4 +%patch7 -p1 -b .bmptopnm +%patch8 -p1 -b .CAN-2005-2471 +%patch9 -p1 -b .xwdfix +%patch10 -p1 -b .ppmtompeg +%patch11 -p1 -b .multilib +%patch12 -p1 -b .pamscale +%patch13 -p1 -b .glibc +%patch14 -p1 -b .pnmtofiasco-stdin +%patch15 -p1 -b .svgtopam + +sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in %build ./configure < 10.47.04-1 +- update to 10.47.04 (it is now stable) (#529525) + * Fri Oct 9 2009 Jindrich Novy 10.35.68-1 - update to 10.35.68