aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorRomain Francoise2008-04-18 18:24:29 +0000
committerRomain Francoise2008-04-18 18:24:29 +0000
commit95de358c3050d1e0162238bbafe05cd598193640 (patch)
treef7242208685fb503ca9de079a342a65f003f0543 /lib-src
parent8a7d9183284d1bb24525df36d452777e70193bb4 (diff)
downloademacs-95de358c3050d1e0162238bbafe05cd598193640.tar.gz
emacs-95de358c3050d1e0162238bbafe05cd598193640.zip
2008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
* vcdiff: Use mktemp (CVE-2008-1694).
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rwxr-xr-xlib-src/vcdiff4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f03217b662d..86448ddbde6 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12008-04-18 Steve Grubb <sgrubb@redhat.com> (tiny change)
2
3 * vcdiff: Use mktemp (CVE-2008-1694).
4
12008-04-09 Jason Rumney <jasonr@gnu.org> 52008-04-09 Jason Rumney <jasonr@gnu.org>
2 6
3 * makefile.w32-in (distclean, maintainer-clean): New targets. 7 * makefile.w32-in (distclean, maintainer-clean): New targets.
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 86b80bcdacd..cb977709db0 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -84,14 +84,14 @@ do
84 case $f in 84 case $f in
85 s.* | */s.*) 85 s.* | */s.*)
86 if 86 if
87 rev1=/tmp/geta$$ 87 rev1=`mktemp /tmp/geta.XXXXXXXX`
88 get -s -p -k $sid1 "$f" > $rev1 && 88 get -s -p -k $sid1 "$f" > $rev1 &&
89 case $sid2 in 89 case $sid2 in
90 '') 90 '')
91 workfile=`expr " /$f" : '.*/s.\(.*\)'` 91 workfile=`expr " /$f" : '.*/s.\(.*\)'`
92 ;; 92 ;;
93 *) 93 *)
94 rev2=/tmp/getb$$ 94 rev2=`mktemp /tmp/getb.XXXXXXXX`
95 get -s -p -k $sid2 "$f" > $rev2 95 get -s -p -k $sid2 "$f" > $rev2
96 workfile=$rev2 96 workfile=$rev2
97 esac 97 esac