From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: Re: [PATCH 2/3] solver: extract_diff: deal with missing "diff --git" line
Date: Thu, 2 Jan 2020 19:04:49 +0000 [thread overview]
Message-ID: <20200102190448.GA19165@dcvr> (raw)
In-Reply-To: <20200102093635.GA11425@dcvr>
Eric Wong <e@80x24.org> wrote:
> Eric Wong <e@80x24.org> wrote:
> > -my %bad_component = map { $_ => 1 } ('', '.', '..');
>
> <snip>
>
> > + # get rid of path-traversal attempts and junk patches:
> > + # it's junk at best, an attack attempt at worse:
> > + state %bad_component = map { $_ => 1 } ('', '.', '..');
>
> Nope, that fails on Perl 5.24.1.
>
> "Initialization of state variables in list context currently forbidden"
>
> :< Otherwise, "state" is a nice 5.10.x feature.
The following is a simple fix which preserves compatibility
with older Perls while keeping the variable contained,
will squash:
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index ef76d706..ade94bd3 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -170,8 +170,8 @@ sub extract_diff ($$) {
# get rid of path-traversal attempts and junk patches:
# it's junk at best, an attack attempt at worse:
- state %bad_component = map { $_ => 1 } ('', '.', '..');
- foreach (@a, @b) { return if $bad_component{$_} }
+ state $bad_component = { map { $_ => 1 } ('', '.', '..') };
+ foreach (@a, @b) { return if $bad_component->{$_} }
$di->{path_a} = join('/', @a);
$di->{path_b} = join('/', @b);
next prev parent reply other threads:[~2020-01-02 19:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 9:24 [PATCH 0/3] solver bugfixes and tweaks Eric Wong
2020-01-02 9:24 ` [PATCH 1/3] solver: try the next patch on apply failures Eric Wong
2020-01-02 9:24 ` [PATCH 2/3] solver: extract_diff: deal with missing "diff --git" line Eric Wong
2020-01-02 9:36 ` Eric Wong
2020-01-02 19:04 ` Eric Wong [this message]
2020-01-02 21:12 ` Eric Wong
2020-01-03 0:43 ` Eric Wong
2020-01-02 9:24 ` [PATCH 3/3] qspawn: use per-call quiet flag for solver Eric Wong
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
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200102190448.GA19165@dcvr \
--to=e@80x24.org \
--cc=meta@public-inbox.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).