diff options
author | Tony Cook <tony@develop-help.com> | 2020-11-10 15:50:27 +1100 |
---|---|---|
committer | Tony Cook <tony@develop-help.com> | 2020-11-11 23:36:17 +0000 |
commit | f877e124a20d4f94c82c36e6b7a99b4e9663e204 (patch) | |
tree | 4ed7b1f43cc6f6ccd919804bee5ccba76eae2f04 | |
parent | 55d39ade3808b7087ce5a23329f238141c066990 (diff) | |
download | perl-f877e124a20d4f94c82c36e6b7a99b4e9663e204.tar.gz |
fetch magic on the first stacked filetest, not the last
fixes #18293
-rw-r--r-- | pp_sys.c | 2 | ||||
-rw-r--r-- | t/op/filetest.t | 10 |
2 files changed, 10 insertions, 2 deletions
@@ -3067,7 +3067,7 @@ S_try_amagic_ftest(pTHX_ char chr) { SV *const arg = *PL_stack_sp; assert(chr != '?'); - if (!(PL_op->op_private & OPpFT_STACKING)) SvGETMAGIC(arg); + if (!(PL_op->op_private & OPpFT_STACKED)) SvGETMAGIC(arg); if (SvAMAGIC(arg)) { diff --git a/t/op/filetest.t b/t/op/filetest.t index fe9724c59a..7c471c050c 100644 --- a/t/op/filetest.t +++ b/t/op/filetest.t @@ -9,7 +9,7 @@ BEGIN { set_up_inc(qw '../lib ../cpan/Perl-OSType/lib'); } -plan(tests => 57 + 27*14); +plan(tests => 58 + 27*14); if ($^O =~ /MSWin32|cygwin|msys/ && !is_miniperl) { require Win32; # for IsAdminUser() @@ -385,3 +385,11 @@ SKIP: { ok(!-f "TEST\0-", '-f on name with \0'); ok(!-r "TEST\0-", '-r on name with \0'); } + +{ + # github #18293 + "" =~ /(.*)/; + my $x = $1; # call magic on $1, setting the pv to "" + "test.pl" =~ /(.*)/; + ok(-f -r $1, "stacked handles on a name with magic"); +} |