|
 |
d35ea2 |
From 07319fdbb283f93cb655c3106b5237cbc7272038 Mon Sep 17 00:00:00 2001
|
|
|
d35ea2 |
From: Tomasz Konojacki <me@xenu.pl>
|
|
|
d35ea2 |
Date: Wed, 30 Dec 2020 14:03:02 +0100
|
|
|
d35ea2 |
Subject: [PATCH] op.c: croak on "my $_" when "use utf8" is in effect
|
|
|
d35ea2 |
MIME-Version: 1.0
|
|
|
d35ea2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d35ea2 |
Content-Transfer-Encoding: 8bit
|
|
|
d35ea2 |
|
|
|
d35ea2 |
Fixes #18449
|
|
|
d35ea2 |
|
|
|
d35ea2 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
d35ea2 |
---
|
|
|
d35ea2 |
op.c | 16 +++++++++-------
|
|
|
d35ea2 |
t/op/mydef.t | 11 +++++++++--
|
|
|
d35ea2 |
2 files changed, 18 insertions(+), 9 deletions(-)
|
|
|
d35ea2 |
|
|
|
d35ea2 |
diff --git a/op.c b/op.c
|
|
|
d35ea2 |
index b2e12dd0c0..dce844d297 100644
|
|
|
d35ea2 |
--- a/op.c
|
|
|
d35ea2 |
+++ b/op.c
|
|
|
d35ea2 |
@@ -730,6 +730,7 @@ PADOFFSET
|
|
|
d35ea2 |
Perl_allocmy(pTHX_ const char *const name, const STRLEN len, const U32 flags)
|
|
|
d35ea2 |
{
|
|
|
d35ea2 |
PADOFFSET off;
|
|
|
d35ea2 |
+ bool is_idfirst, is_default;
|
|
|
d35ea2 |
const bool is_our = (PL_parser->in_my == KEY_our);
|
|
|
d35ea2 |
|
|
|
d35ea2 |
PERL_ARGS_ASSERT_ALLOCMY;
|
|
|
d35ea2 |
@@ -738,14 +739,15 @@ Perl_allocmy(pTHX_ const char *const name, const STRLEN len, const U32 flags)
|
|
|
d35ea2 |
Perl_croak(aTHX_ "panic: allocmy illegal flag bits 0x%" UVxf,
|
|
|
d35ea2 |
(UV)flags);
|
|
|
d35ea2 |
|
|
|
d35ea2 |
+ is_idfirst = flags & SVf_UTF8
|
|
|
d35ea2 |
+ ? isIDFIRST_utf8_safe((U8*)name + 1, name + len)
|
|
|
d35ea2 |
+ : isIDFIRST_A(name[1]);
|
|
|
d35ea2 |
+
|
|
|
d35ea2 |
+ /* $_, @_, etc. */
|
|
|
d35ea2 |
+ is_default = len == 2 && name[1] == '_';
|
|
|
d35ea2 |
+
|
|
|
d35ea2 |
/* complain about "my $<special_var>" etc etc */
|
|
|
d35ea2 |
- if ( len
|
|
|
d35ea2 |
- && !( is_our
|
|
|
d35ea2 |
- || isALPHA(name[1])
|
|
|
d35ea2 |
- || ( (flags & SVf_UTF8)
|
|
|
d35ea2 |
- && isIDFIRST_utf8_safe((U8 *)name+1, name + len))
|
|
|
d35ea2 |
- || (name[1] == '_' && len > 2)))
|
|
|
d35ea2 |
- {
|
|
|
d35ea2 |
+ if (!is_our && (!is_idfirst || is_default)) {
|
|
|
d35ea2 |
const char * const type =
|
|
|
d35ea2 |
PL_parser->in_my == KEY_sigvar ? "subroutine signature" :
|
|
|
d35ea2 |
PL_parser->in_my == KEY_state ? "\"state\"" : "\"my\"";
|
|
|
d35ea2 |
diff --git a/t/op/mydef.t b/t/op/mydef.t
|
|
|
d35ea2 |
index 42a81d9ab0..225ce98e51 100644
|
|
|
d35ea2 |
--- a/t/op/mydef.t
|
|
|
d35ea2 |
+++ b/t/op/mydef.t
|
|
|
d35ea2 |
@@ -6,10 +6,17 @@ BEGIN {
|
|
|
d35ea2 |
set_up_inc('../lib');
|
|
|
d35ea2 |
}
|
|
|
d35ea2 |
|
|
|
d35ea2 |
-plan tests => 1;
|
|
|
d35ea2 |
-
|
|
|
d35ea2 |
use strict;
|
|
|
d35ea2 |
|
|
|
d35ea2 |
eval 'my $_';
|
|
|
d35ea2 |
like $@, qr/^Can't use global \$_ in "my" at /;
|
|
|
d35ea2 |
|
|
|
d35ea2 |
+{
|
|
|
d35ea2 |
+ # using utf8 allows $_ to be declared with 'my'
|
|
|
d35ea2 |
+ # GH #18449
|
|
|
d35ea2 |
+ use utf8;
|
|
|
d35ea2 |
+ eval 'my $_;';
|
|
|
d35ea2 |
+ like $@, qr/^Can't use global \$_ in "my" at /;
|
|
|
d35ea2 |
+}
|
|
|
d35ea2 |
+
|
|
|
d35ea2 |
+done_testing;
|
|
|
d35ea2 |
--
|
|
|
d35ea2 |
2.26.2
|
|
|
d35ea2 |
|