|
 |
dcb3b7 |
From 86a48d83a7caf38c553000a250ed1359c235f55e Mon Sep 17 00:00:00 2001
|
|
|
dcb3b7 |
From: Tony Cook <tony@develop-help.com>
|
|
|
dcb3b7 |
Date: Thu, 19 Oct 2017 10:46:04 +1100
|
|
|
dcb3b7 |
Subject: [PATCH] (perl #132245) don't try to process a char range with no
|
|
|
dcb3b7 |
preceding char
|
|
|
dcb3b7 |
MIME-Version: 1.0
|
|
|
dcb3b7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dcb3b7 |
Content-Transfer-Encoding: 8bit
|
|
|
dcb3b7 |
|
|
|
dcb3b7 |
A range like \N{}-0 eventually results in compilation failing, but
|
|
|
dcb3b7 |
before that, get_and_check_backslash_N_name() attempts to treat
|
|
|
dcb3b7 |
the memory before the empty output of \N{} as a character.
|
|
|
dcb3b7 |
|
|
|
dcb3b7 |
Petr Písař: Ported to 5.24.3.
|
|
|
dcb3b7 |
|
|
|
dcb3b7 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
dcb3b7 |
---
|
|
|
dcb3b7 |
t/lib/warnings/toke | 5 +++++
|
|
|
dcb3b7 |
toke.c | 4 ++--
|
|
|
dcb3b7 |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
dcb3b7 |
|
|
|
dcb3b7 |
diff --git a/t/lib/warnings/toke b/t/lib/warnings/toke
|
|
|
dcb3b7 |
index 493c8a2..4a521e0 100644
|
|
|
dcb3b7 |
--- a/t/lib/warnings/toke
|
|
|
dcb3b7 |
+++ b/t/lib/warnings/toke
|
|
|
dcb3b7 |
@@ -1509,3 +1509,8 @@ my $v = 𝛃 - 5;
|
|
|
dcb3b7 |
EXPECT
|
|
|
dcb3b7 |
OPTION regex
|
|
|
dcb3b7 |
(Wide character.*\n)?Warning: Use of "𝛃" without parentheses is ambiguous
|
|
|
dcb3b7 |
+########
|
|
|
dcb3b7 |
+# NAME tr/// range with empty \N{} at the start
|
|
|
dcb3b7 |
+tr//\N{}-0/;
|
|
|
dcb3b7 |
+EXPECT
|
|
|
dcb3b7 |
+Unknown charname '' is deprecated at - line 1.
|
|
|
dcb3b7 |
diff --git a/toke.c b/toke.c
|
|
|
dcb3b7 |
index f2310cc..3d93fac 100644
|
|
|
dcb3b7 |
--- a/toke.c
|
|
|
dcb3b7 |
+++ b/toke.c
|
|
|
dcb3b7 |
@@ -2906,8 +2906,8 @@ S_scan_const(pTHX_ char *start)
|
|
|
dcb3b7 |
* at least one character, then see if this next one is a '-',
|
|
|
dcb3b7 |
* indicating the previous one was the start of a range. But
|
|
|
dcb3b7 |
* don't bother if we're too close to the end for the minus to
|
|
|
dcb3b7 |
- * mean that. */
|
|
|
dcb3b7 |
- if (*s != '-' || s >= send - 1 || s == start) {
|
|
|
dcb3b7 |
+ * mean that, or if we haven't output any characters yet. */
|
|
|
dcb3b7 |
+ if (*s != '-' || s >= send - 1 || s == start || d == SvPVX(sv)) {
|
|
|
dcb3b7 |
|
|
|
dcb3b7 |
/* A regular character. Process like any other, but first
|
|
|
dcb3b7 |
* clear any flags */
|
|
|
dcb3b7 |
--
|
|
|
dcb3b7 |
2.13.6
|
|
|
dcb3b7 |
|