Brad Bishop | 220d553 | 2018-08-14 00:59:39 +0100 | [diff] [blame] | 1 | From f65da1ca2eee74696d9c120e9d69af37b4fa1920 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tony Cook <tony@develop-help.com> |
| 3 | Date: Mon, 19 Feb 2018 15:11:42 +1100 |
| 4 | Subject: [PATCH] (perl #132063) we should no longer warn for this code |
| 5 | |
| 6 | The first patch for 132063 prevented the buffer read overflow when |
| 7 | dumping the warning but didn't fix the underlying problem. |
| 8 | |
| 9 | The next change treats the supplied buffer correctly, preventing the |
| 10 | non-UTF-8 SV from being treated as UTF-8, preventing the warning. |
| 11 | |
| 12 | (cherry picked from commit 1e8b61488f195e1396aa801c685340b156104f4f) |
| 13 | |
| 14 | CVE: CVE-2018-6798 |
| 15 | Upstream-Status: Backport [https://perl5.git.perl.org/perl.git/commitdiff/f65da1ca2eee74696d9c120e9d69af37b4fa1920] |
| 16 | |
| 17 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> |
| 18 | --- |
| 19 | t/lib/warnings/regexec | 3 --- |
| 20 | 1 file changed, 3 deletions(-) |
| 21 | |
| 22 | diff --git a/t/lib/warnings/regexec b/t/lib/warnings/regexec |
| 23 | index 6635142dea..c370ddc3c7 100644 |
| 24 | --- a/t/lib/warnings/regexec |
| 25 | +++ b/t/lib/warnings/regexec |
| 26 | @@ -262,8 +262,5 @@ setlocale(&POSIX::LC_CTYPE, $utf8_locale); |
| 27 | EXPECT |
| 28 | ######## |
| 29 | # NAME perl #132063, read beyond buffer end |
| 30 | -# OPTION fatal |
| 31 | "\xff" =~ /(?il)\x{100}|\x{100}/; |
| 32 | EXPECT |
| 33 | -Malformed UTF-8 character: \xff (too short; 1 byte available, need 13) in pattern match (m//) at - line 2. |
| 34 | -Malformed UTF-8 character (fatal) at - line 2. |
| 35 | -- |
| 36 | 2.15.1-424-g9478a660812 |
| 37 | |