53 lines
1.4 KiB
Text
53 lines
1.4 KiB
Text
$NetBSD: patch-ab,v 1.12 2006/03/09 14:50:31 ghen Exp $
|
|
|
|
Security fix for CVE-2005-3126.
|
|
|
|
--- kantiword.orig 2004-11-19 20:39:38.000000000 +0100
|
|
+++ kantiword 2006-01-23 15:14:55.000000000 +0100
|
|
@@ -10,41 +9,12 @@
|
|
exit 0
|
|
fi
|
|
|
|
-# Determine the temp directory
|
|
-if [ -d "$TMPDIR" ] && [ -w "$TMPDIR" ]
|
|
-then
|
|
- tmp_dir=$TMPDIR
|
|
-elif [ -d "$TEMP" ] && [ -w "$TEMP" ]
|
|
-then
|
|
- tmp_dir=$TEMP
|
|
-else
|
|
- tmp_dir="/tmp"
|
|
-fi
|
|
-
|
|
# Try to create the temp files in a secure way
|
|
-if [ -x /bin/tempfile ]
|
|
-then
|
|
- out_file=`/bin/tempfile -d "$tmp_dir" -p antiword -s ".ps"` || exit 1
|
|
- err_file=`/bin/tempfile -d "$tmp_dir" -p antiword -s ".err"`
|
|
- if [ $? -ne 0 ]
|
|
- then
|
|
- rm -f "$out_file"
|
|
- exit 1
|
|
- fi
|
|
-elif [ -x /bin/mktemp ]
|
|
-then
|
|
- out_file=`/bin/mktemp -q -p "$tmp_dir" antiword.ps.XXXXXXXXX` || exit 1
|
|
- err_file=`/bin/mktemp -q -p "$tmp_dir" antiword.err.XXXXXXXXX`
|
|
- if [ $? -ne 0 ]
|
|
- then
|
|
- rm -f "$out_file"
|
|
- exit 1
|
|
- fi
|
|
-else
|
|
- # Creating the temp files in an un-secure way
|
|
- out_file=$tmp_dir"/antiword.$$.ps"
|
|
- err_file=$tmp_dir"/antiword.$$.err"
|
|
-fi
|
|
+out_file=`mktemp -q -t ${0##*/}.ps.XXXXXXXXX` || \
|
|
+ { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
|
+err_file=`mktemp -q -t ${0##*/}.err.XXXXXXXXX` || \
|
|
+ { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
|
+trap "rm -f -- \"$out_file\" \"$err_file\"" 0 1 2 3 13 15
|
|
|
|
# Determine the paper size
|
|
paper_size=$1
|