Change 19837 by [EMAIL PROTECTED] on 2003/06/22 15:56:45
Debian fix from Brendan O'Dea:
Use a temporary directory to avoid symlink attacks.
Specify -gstabs explicitly (not the default format for gcc 3.2).
Affected files ...
... //depot/perl/utils/c2ph.PL#11 edit
Differences ...
==== //depot/perl/utils/c2ph.PL#11 (text) ====
Index: perl/utils/c2ph.PL
--- perl/utils/c2ph.PL#10~18007~ Sat Oct 12 07:22:36 2002
+++ perl/utils/c2ph.PL Sun Jun 22 08:56:45 2003
@@ -353,13 +353,25 @@
$indent = 2;
$CC = 'cc';
-$CFLAGS = '-g -S';
+!NO!SUBS!
+
+if (($Config{gccversion} || '') =~ /^(\d+)\.(\d+)/
+ and ($1 > 3 or ($1 == 3 and $2 >= 2))) {
+ print OUT q/$CFLAGS = '-gstabs -S';/;
+} else {
+ print OUT q/$CFLAGS = '-g -S';/;
+}
+
+print OUT <<'!NO!SUBS!';
+
$DEFINES = '';
$perl++ if $0 =~ m#/?c2ph$#;
require 'getopts.pl';
+use File::Temp 'tempdir';
+
eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_]+=)(.*)/ && shift;
&Getopts('aixdpvtnws:') || &usage(0);
@@ -488,9 +500,10 @@
$ARGV[0] =~ s/\.c$/.s/;
}
else {
- $TMP = "/tmp/c2ph.$$.c";
+ $TMPDIR = tempdir(CLEANUP => 1);
+ $TMP = "$TMPDIR/c2ph.$$.c";
&system("cat @ARGV > $TMP") && exit 1;
- &system("cd /tmp; $CC $CFLAGS $DEFINES $TMP") && exit 1;
+ &system("cd $TMPDIR; $CC $CFLAGS $DEFINES $TMP") && exit 1;
unlink $TMP;
$TMP =~ s/\.c$/.s/;
@ARGV = ($TMP);
@@ -1261,7 +1274,8 @@
}
sub compute_intrinsics {
- local($TMP) = "/tmp/c2ph-i.$$.c";
+ $TMPDIR ||= tempdir(CLEANUP => 1);
+ local($TMP) = "$TMPDIR/c2ph-i.$$.c";
open (TMP, ">$TMP") || die "can't open $TMP: $!";
select(TMP);
@@ -1289,7 +1303,7 @@
close TMP;
select(STDOUT);
- open(PIPE, "cd /tmp && $CC $TMP && /tmp/a.out|");
+ open(PIPE, "cd $TMPDIR && $CC $TMP && $TMPDIR/a.out|");
while (<PIPE>) {
chop;
split(' ',$_,2);;
@@ -1298,7 +1312,7 @@
$intrinsics{$_[1]} = $template{$_[0]};
}
close(PIPE) || die "couldn't read intrinsics!";
- unlink($TMP, '/tmp/a.out');
+ unlink($TMP, '$TMPDIR/a.out');
print STDERR "done\n" if $trace;
}
End of Patch.