|
 |
3f1b01 |
From f877e124a20d4f94c82c36e6b7a99b4e9663e204 Mon Sep 17 00:00:00 2001
|
|
|
3f1b01 |
From: Tony Cook <tony@develop-help.com>
|
|
|
3f1b01 |
Date: Tue, 10 Nov 2020 15:50:27 +1100
|
|
|
3f1b01 |
Subject: [PATCH] fetch magic on the first stacked filetest, not the last
|
|
|
3f1b01 |
MIME-Version: 1.0
|
|
|
3f1b01 |
Content-Type: text/plain; charset=UTF-8
|
|
|
3f1b01 |
Content-Transfer-Encoding: 8bit
|
|
|
3f1b01 |
|
|
|
3f1b01 |
fixes #18293
|
|
|
3f1b01 |
|
|
|
3f1b01 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
3f1b01 |
---
|
|
|
3f1b01 |
pp_sys.c | 2 +-
|
|
|
3f1b01 |
t/op/filetest.t | 10 +++++++++-
|
|
|
3f1b01 |
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
3f1b01 |
|
|
|
3f1b01 |
diff --git a/pp_sys.c b/pp_sys.c
|
|
|
3f1b01 |
index 66c5d9aade..5c9f768eaf 100644
|
|
|
3f1b01 |
--- a/pp_sys.c
|
|
|
3f1b01 |
+++ b/pp_sys.c
|
|
|
3f1b01 |
@@ -3067,7 +3067,7 @@ S_try_amagic_ftest(pTHX_ char chr) {
|
|
|
3f1b01 |
SV *const arg = *PL_stack_sp;
|
|
|
3f1b01 |
|
|
|
3f1b01 |
assert(chr != '?');
|
|
|
3f1b01 |
- if (!(PL_op->op_private & OPpFT_STACKING)) SvGETMAGIC(arg);
|
|
|
3f1b01 |
+ if (!(PL_op->op_private & OPpFT_STACKED)) SvGETMAGIC(arg);
|
|
|
3f1b01 |
|
|
|
3f1b01 |
if (SvAMAGIC(arg))
|
|
|
3f1b01 |
{
|
|
|
3f1b01 |
diff --git a/t/op/filetest.t b/t/op/filetest.t
|
|
|
3f1b01 |
index fe9724c59a..7c471c050c 100644
|
|
|
3f1b01 |
--- a/t/op/filetest.t
|
|
|
3f1b01 |
+++ b/t/op/filetest.t
|
|
|
3f1b01 |
@@ -9,7 +9,7 @@ BEGIN {
|
|
|
3f1b01 |
set_up_inc(qw '../lib ../cpan/Perl-OSType/lib');
|
|
|
3f1b01 |
}
|
|
|
3f1b01 |
|
|
|
3f1b01 |
-plan(tests => 57 + 27*14);
|
|
|
3f1b01 |
+plan(tests => 58 + 27*14);
|
|
|
3f1b01 |
|
|
|
3f1b01 |
if ($^O =~ /MSWin32|cygwin|msys/ && !is_miniperl) {
|
|
|
3f1b01 |
require Win32; # for IsAdminUser()
|
|
|
3f1b01 |
@@ -385,3 +385,11 @@ SKIP: {
|
|
|
3f1b01 |
ok(!-f "TEST\0-", '-f on name with \0');
|
|
|
3f1b01 |
ok(!-r "TEST\0-", '-r on name with \0');
|
|
|
3f1b01 |
}
|
|
|
3f1b01 |
+
|
|
|
3f1b01 |
+{
|
|
|
3f1b01 |
+ # github #18293
|
|
|
3f1b01 |
+ "" =~ /(.*)/;
|
|
|
3f1b01 |
+ my $x = $1; # call magic on $1, setting the pv to ""
|
|
|
3f1b01 |
+ "test.pl" =~ /(.*)/;
|
|
|
3f1b01 |
+ ok(-f -r $1, "stacked handles on a name with magic");
|
|
|
3f1b01 |
+}
|
|
|
3f1b01 |
--
|
|
|
3f1b01 |
2.25.4
|
|
|
3f1b01 |
|