Do some quoting on debug output (needed if the server might not be trustworthy and...

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2938ae11855b5f48208af630792ec9a37c66b8a9..edb338ca455a3e9f50405a139518292a1f94931a 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -173,8 +173,13 @@ sub cmdoutput_errok {
     die $! if P->error;
     if (!close P) { printdebug "=>!$?\n"; return undef; }
     chomp $d;
-    $d =~ m/^.*/;
-    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debuglevel>0; #';
+    if ($debuglevel > 0) {
+       $d =~ m/^.*/;
+       my $dd = $&;
+       my $more = (length $' ? '...' : ''); #');
+       $dd =~ s{[^\n -~]|\\}{ sprintf "\\x%02x", ord $& }ge;
+       printdebug "=> \`$dd'",$more,"\n";
+    }
     return $d;
 }
 

diff --git a/debian/changelog b/debian/changelog
index fd664d3e06aeee5070bc9ed512e1a1b7b95eb459..c6b28b577d9a50c981ab749ad6eb74a3f258650e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ dgit (0.31~~) unstable; urgency=low
   Access machinery:
   * Provide for different access mechanisms when pushing.
   * Provide for configurable git url suffix.
+  * Do some quoting on debug output (needed if the server might not
+    be trustworthy and might send us bad stuff).
 
   Infrastructure:
   * Provide for mirroring git updates to a different server.