Группа :: Графика
Пакет: netpbm
навигация по пакетам
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: netpbm-10.22-security2.patch
--- netpbm-10.22/editor/ppmquantall.security2 2003-12-31 04:56:24.000000000 +0100
+++ netpbm-10.22/editor/ppmquantall 2004-06-30 14:55:13.820546555 +0200
@@ -63,13 +63,8 @@
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[@]} | ppmquant $newcolors > $allif [ $? != 0 ]; then
--- netpbm-10.22/editor/pnmmargin.security2 2003-12-31 05:01:26.000000000 +0100
+++ netpbm-10.22/editor/pnmmargin 2004-06-30 15:00:53.814556218 +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 @@
shift
if [ ! ${1-""} ] ; thenecho "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
color="$1"
@@ -46,6 +44,9 @@
;;
-* )
echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
;;
* )
@@ -56,6 +57,9 @@
if [ ! ${1-""} ] ; thenecho "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
size="$1"
@@ -63,6 +67,9 @@
if [ ${2-""} ] ; thenecho "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
@@ -86,3 +93,7 @@
# Cat things together.
pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
pnmcat -tb $tmp3 $tmp4 $tmp3
+
+if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+fi
--- netpbm-10.22/editor/pamstretch-gen.security2 2003-12-31 04:47:10.000000000 +0100
+++ netpbm-10.22/editor/pamstretch-gen 2004-06-30 16:02:24.705968769 +0200
@@ -31,10 +31,7 @@
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
--- netpbm-10.22/editor/ppmfade.security2 2003-08-18 01:41:59.000000000 +0200
+++ netpbm-10.22/editor/ppmfade 2004-06-30 14:51:08.412822427 +0200
@@ -14,6 +14,7 @@
#
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
use strict;
+use File::Temp "tempdir";
my $SPREAD = 1;
my $SHIFT = 2;
@@ -116,20 +117,26 @@
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");}
#
@@ -152,148 +159,150 @@
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 j$tmpdir/unko$$.ppm $tmpdir/junko$$.ppm " .+ ">$tmpdir/junk2o$$.ppm");
}
} elsif ($mode eq $BLOCK) { if ($i <= 10) {my $n = 1 - 1.9*$spline20[$i];
- system("pnmscale $n junk1$$.ppm | " .- "pnmscale -width $width -height $height >junk3$$.ppm");
+ system("pnmscale $n $tmpdir/junk1$$.ppm | " .+ "pnmscale -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("pnmscale $n junk2$$.ppm | " .- "pnmscale -width $width -height $height >junk3$$.ppm");
+ system("pnmscale $n $tmpdir/junk2$$.ppm | " .+ "pnmscale -width $width -height $height >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {- system("cp", "junk3$$.ppm", "junk1a$$.ppm");- system("pnmscale $n junk2$$.ppm | " .- "pnmscale -width $width -height $height >junk2a$$.ppm");
+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");+ system("pnmscale $n $tmpdir/junk2$$.ppm | " .+ "pnmscale -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 junk*$$.ppm");+# As the temporary files are automatically deleted, nothing is needed for
+# cleanup any more.
exit(0);
--- netpbm-10.22/editor/ppmshadow.security2 2004-01-31 04:35:48.000000000 +0100
+++ netpbm-10.22/editor/ppmshadow 2004-06-30 16:01:24.378413183 +0200
@@ -27,9 +27,10 @@
my $true=1; my $false=0;
my $tmpdir = $ENV{TMPDIR} || "/tmp";-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp) or
- die("Unable to create directory for temporary files '$ourtmp");+chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {+ die "Can't create tmpdir";
+}
# Process command line options
--- netpbm-10.22/converter/other/anytopnm.security2 2003-12-31 04:49:34.000000000 +0100
+++ netpbm-10.22/converter/other/anytopnm 2004-06-30 14:58:25.242904602 +0200
@@ -503,11 +503,7 @@
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 1 3 15
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
# Take out all spaces
# Find the filename extension for last-ditch efforts later
@@ -528,9 +524,17 @@
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
--- netpbm-10.22/converter/ppm/ppmtompeg/parallel.c.security2 2004-06-30 14:51:08.365828224 +0200
+++ netpbm-10.22/converter/ppm/ppmtompeg/parallel.c 2004-06-30 14:51:08.409822797 +0200
@@ -609,8 +609,11 @@
int numBytes; /* Number of data bytes in message */
FILE * filePtr;
char fileName[256];
+#define TMPFILE_TEMPLATE "/tmp/ppmtompeg.XXXXXX"
- sprintf(fileName, "/tmp/foobar%d", machineNumber);
+ strcpy(fileName, TMPFILE_TEMPLATE);
+ if (-1 == mkstemp(fileName))
+ pm_error( "could not create temporary convolution file");
filePtr = fopen(fileName, "wb");
/* read in stuff, SafeWrite to file, perform local conversion */