From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH] eml: avoid anonymous __WARN__ sub for encode/decode
Date: Wed, 7 Feb 2024 21:26:03 +0000 [thread overview]
Message-ID: <20240207212603.1291037-1-e@80x24.org> (raw)
Repeatedly creating and allocating an anonymous sub is an
expensive operation and a potential source of leaks in older
Perl. Instead, `local'-ize a global and use a permanent sub
to workaround the old Encode 2.87..3.12 leak.
---
lib/PublicInbox/Eml.pm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Eml.pm b/lib/PublicInbox/Eml.pm
index 24060ec8..56aec1e5 100644
--- a/lib/PublicInbox/Eml.pm
+++ b/lib/PublicInbox/Eml.pm
@@ -334,6 +334,11 @@ sub body_set {
undef;
}
+# workaround https://rt.cpan.org/Public/Bug/Display.html?id=139622
+# Encode 2.87..3.12 leaks on croak, so we defer and croak ourselves
+our @enc_warn;
+my $enc_warn = sub { push @enc_warn, @_ };
+
sub body_str_set {
my ($self, $str) = @_;
my $cs = ct($self)->{attributes}->{charset} //
@@ -341,10 +346,10 @@ sub body_str_set {
my $enc = find_encoding($cs) // croak "unknown encoding `$cs'";
my $tmp;
{
- my @w;
- local $SIG{__WARN__} = sub { push @w, @_ };
+ local @enc_warn;
+ local $SIG{__WARN__} = $enc_warn;
$tmp = $enc->encode($str, Encode::FB_WARN);
- croak(@w) if @w;
+ croak(@enc_warn) if @enc_warn;
};
body_set($self, \$tmp);
}
@@ -471,11 +476,10 @@ sub body_str {
};
my $enc = find_encoding($cs) or croak "unknown encoding `$cs'";
my $tmp = body($self);
- # workaround https://rt.cpan.org/Public/Bug/Display.html?id=139622
- my @w;
- local $SIG{__WARN__} = sub { push @w, @_ };
+ local @enc_warn;
+ local $SIG{__WARN__} = $enc_warn;
my $ret = $enc->decode($tmp, Encode::FB_WARN);
- croak(@w) if @w;
+ croak(@enc_warn) if @enc_warn;
$ret;
}
reply other threads:[~2024-02-07 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240207212603.1291037-1-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).