Ticket #51292: patch-CVE-2015-0857.diff

tardiff

@@ -6 +6 @@
 # Published under GNU GPL conditions
 
 use strict;
+use Text::Diff;
 
 my $VERSION = '0.1';
 
@@ -73 +74 @@
                 $flag = "-j";
         }
 
-        my $list = `gnutar -C $tempdir $flag -xvf $tarball 2>/dev/null`;
+        open(TARLIST, '-|', qw(gnutar -C), $tempdir, $flag, qw(-xvf), $tarball)
+            or die "Can't call tar as expected: $!";
+        local $/ = undef; # slurp mode
+        my $list = <TARLIST> or die "Couldn't read from tar";
+        close(TARLIST) or warn "tar exited with non-zero exit code";
+
         return $list;
 }
 
@@ -116 +122 @@
         if(-d $file1 and -d $file2){
                 return 0;
         }elsif(-f $file1 and -f $file2){
-                my $diff = `diff $file1 $file2`;
+                my $diff = diff $file1, $file2, { STYLE => "OldStyle" };
                 if($diff){
                         if($opt_stats){
                                 my $plus = 0;