From 52e37476e8e62e8e54104d9a2abcf2a86d1d1a32 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 28 Jun 2020 07:14:40 +0000 Subject: eml: header_str_set: correctly encode UTF-8 headers Apparently, using $1 from an octet string still results in a multi-byte string. Thus we need to perform utf8::encode after the regexp character match to ensure wide characters don't get passed to encode_base64. This fixes a bug in which caused -watch to crash when using PublicInbox::Filter::SubjectTag to remove "[list prefix]" tags from Subject: lines. I only found this bug because the proposed -watch updates for NNTP/IMAP support introduced a possible bug which triggered a full rescan of old archives: https://public-inbox.org/meta/20200627100400.9871-1-e@yhbt.net/ --- lib/PublicInbox/Eml.pm | 7 +++++-- t/filter_subjecttag.t | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Eml.pm b/lib/PublicInbox/Eml.pm index ec682b91..1fecd41b 100644 --- a/lib/PublicInbox/Eml.pm +++ b/lib/PublicInbox/Eml.pm @@ -368,9 +368,12 @@ sub header_str_set { my ($self, $name, @vals) = @_; for (@vals) { next unless /[^\x20-\x7e]/; - utf8::encode($_); # to octets # 39: int((75 - length("Subject: =?UTF-8?B?".'?=') ) / 4) * 3; - s/(.{1,39})/'=?UTF-8?B?'.encode_base64($1, '').'?='/ges; + s/(.{1,39})/ + my $x = $1; + utf8::encode($x); # to octets + '=?UTF-8?B?'.encode_base64($x, '').'?=' + /xges; } header_set($self, $name, @vals); } diff --git a/t/filter_subjecttag.t b/t/filter_subjecttag.t index 75effa27..e2d91e74 100644 --- a/t/filter_subjecttag.t +++ b/t/filter_subjecttag.t @@ -24,4 +24,14 @@ $mime->header_str_set('Subject', '[FOO] bar'); $mime = $f->delivery($mime); is($mime->header('Subject'), 'bar', 'filtered non-reply'); +$f = PublicInbox::Filter::SubjectTag->new(-tag => '[sox-devel]'); +my $eml = PublicInbox::Eml->new(<delivery($eml); +my $s = $eml->header('Subject'); +utf8::encode($s); # to octets +is($s, "Re: \xc5\xa1", 'subject filtered correctly'); + done_testing(); -- cgit v1.2.3-24-ge0c7