Bug#902115: Fails to handle file names containing '\x2'

[Chris Lamb]

retitle 902115 Fails to handle file names containing '\x2'
tags 902115 + patch
thanks

Hi,

> Fails to handle file names containing '\x2'

Patch attached with (minimised) testcase. I can confirm this
successfully re-generates:

  8803baa484cbe36680463c8c5e6febeff074b8e7  /tmp/buildd/systemd_239.orig.tar.gz


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-

diff --git a/pristine-tar b/pristine-tar
index c5de937..0fe132e 100755
--- a/pristine-tar
+++ b/pristine-tar
@@ -664,7 +664,7 @@ sub genmanifest {
     chomp;
     # ./ or / in the manifest just confuses tar
     s/^\.?\/+//;
-    print OUT "$_\n" if length $_;
+    print OUT unquote_filename($_) . "\n" if length $_;
   }
   close IN;
   close OUT;
diff --git a/test/samples/tarballs/systemd_239.orig.tar.gz 
b/test/samples/tarballs/systemd_239.orig.tar.gz
new file mode 100644
index 0000000..120efb6
Binary files /dev/null and b/test/samples/tarballs/systemd_239.orig.tar.gz 
differ
diff --git a/test/test_roundtrip.sh b/test/test_roundtrip.sh
index 9479c44..ab6c240 100644
--- a/test/test_roundtrip.sh
+++ b/test/test_roundtrip.sh
@@ -55,4 +55,8 @@ test_gz_16_rsyncable() {
   assertWorksWithTarball 
$SAMPLES/tarballs/libinotify-kqueue-1.6rsyncable_20120419.orig.tar.gz
 }
 
+test_escaping() {
+  assertWorksWithTarball $SAMPLES/tarballs/systemd_239.orig.tar.gz
+}
+
 . shunit2

systemd_239.orig.tar.gz
Description: application/gzip