[Debian-l10n-commits] [ddtp] 03/04: Fix UTF-8 check now Encode::decode_utf8 apparently clobbers argument.

[Martijn van Oosterhout]

This is an automated email from the git hooks/post-receive script.

kleptog-guest pushed a commit to branch master
in repository ddtp.

commit 860e563a1307456a64e039b0d4c881ea9f754a87
Author: Martijn van Oosterhout <kleptog at svana.org>
Date:   Sat Jan 18 15:59:34 2014 +0000

    Fix UTF-8 check now Encode::decode_utf8 apparently clobbers argument.
---
 ddtss/ddtss-cgi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ddtss/ddtss-cgi b/ddtss/ddtss-cgi
index 9212b37..c5e841e 100755
--- a/ddtss/ddtss-cgi
+++ b/ddtss/ddtss-cgi
@@ -1041,7 +1041,9 @@ sub forexternalreview_display
   { display_error( "Fetched description didn't contain package name" ) }
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {
@@ -1456,8 +1458,12 @@ sub submit_externalreview
   $long =~ s/^/ /mg; # Insert leading space
 
   eval {
+    my $tempshort = $short;
+    my $templong = $long;
     my $shortx = Encode::decode_utf8($short, Encode::FB_CROAK);
     my $longx = Encode::decode_utf8($long, Encode::FB_CROAK);
+    $short = $tempshort;
+    $long = $templong;
     
     if( length($shortx) > 80 or $longx =~ /^.{80}/m )
     {
@@ -1498,7 +1504,9 @@ sub submit_externalreview
   { return( "Fetched description didn't contain package name" ) }
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {
@@ -1568,8 +1576,12 @@ sub submit_translation
   }
   
   eval {
+    my $tempshort = $short;
+    my $templong = $long;
     my $shortx = Encode::decode_utf8($short, Encode::FB_CROAK);
     my $longx = Encode::decode_utf8($long, Encode::FB_CROAK);
+    $short = $tempshort;
+    $long = $templong;
     
     if( length($shortx) > 80 or $longx =~ /^.{80}/m )
     {
@@ -1752,7 +1764,9 @@ sub fetch_translation
   $package = $fetch_package;
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/ddtp.git