You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/30 18:38:17 UTC

svn commit: r1864018 - /spamassassin/trunk/masses/mass-check

Author: hege
Date: Tue Jul 30 18:38:17 2019
New Revision: 1864018

URL: http://svn.apache.org/viewvc?rev=1864018&view=rev
Log:
Bug 6226 - mass-check lossage on NUL bytes and double-byte characters in hit texts

Modified:
    spamassassin/trunk/masses/mass-check

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=1864018&r1=1864017&r2=1864018&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Tue Jul 30 18:38:17 2019
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
+use MIME::Base64;
 
 #
 # <@LICENSE>
@@ -1088,6 +1089,7 @@ sub start_children {
 	  $line = Mail::SpamAssassin::ArchiveIterator::_index_pack($date, $class, $format, $where);
         }
 
+	$result = encode_base64($result);
 	send_line($parent,"$result\0RESULT $line");
       }
       exit;
@@ -1618,7 +1620,7 @@ sub run_through_messages {
           $select->remove($socket);
         }
         elsif ($line =~ /^([^\0]*)\0RESULT (.+)$/s) {
-	  my $result = $1;
+	  my $result = decode_base64($1);
 	  my ($date,$class,$type) = Mail::SpamAssassin::ArchiveIterator::_index_unpack($2);
 	  aidbg "mass-check: $class, $type, $date\n";