44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
From 05b9033b464ce8dd2c9b33238f9aa14755d7a91a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karl Williamson <khw@cpan.org>
|
||
|
|
Date: Sat, 17 Jun 2017 17:56:10 -0600
|
||
|
|
Subject: [PATCH] utf8n_to_uvchr(): Don't display too many bytes in msg
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
When raising a message about malformed UTF-8, we shouldn't display bytes
|
||
|
|
from the next character, unless those bytes were expected to have been
|
||
|
|
part of the current one. Tests for this will be added in future commits
|
||
|
|
in ext/XS-APItest/t/utf8_warn_base.pl
|
||
|
|
|
||
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||
|
|
---
|
||
|
|
utf8.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/utf8.c b/utf8.c
|
||
|
|
index ee5405f..e55a6f1 100644
|
||
|
|
--- a/utf8.c
|
||
|
|
+++ b/utf8.c
|
||
|
|
@@ -1428,7 +1428,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s,
|
||
|
|
if (pack_warn) {
|
||
|
|
message = Perl_form(aTHX_ "%s: %s (overflows)",
|
||
|
|
malformed_text,
|
||
|
|
- _byte_dump_string(s0, send - s0, 0));
|
||
|
|
+ _byte_dump_string(s0, curlen, 0));
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -1554,7 +1554,7 @@ Perl_utf8n_to_uvchr_error(pTHX_ const U8 *s,
|
||
|
|
"%s: %s (overlong; instead use %s to represent"
|
||
|
|
" U+%0*" UVXf ")",
|
||
|
|
malformed_text,
|
||
|
|
- _byte_dump_string(s0, send - s0, 0),
|
||
|
|
+ _byte_dump_string(s0, curlen, 0),
|
||
|
|
_byte_dump_string(tmpbuf, e - tmpbuf, 0),
|
||
|
|
((uv < 256) ? 2 : 4), /* Field width of 2 for
|
||
|
|
small code points */
|
||
|
|
--
|
||
|
|
2.9.4
|
||
|
|
|