| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 73d7247ecab863ef26b5687a37ccc75d6144ad0f Mon Sep 17 00:00:00 2001 |
| 2 | From: Karl Williamson <khw@cpan.org> |
| 3 | Date: Tue, 17 Oct 2017 13:49:14 +0800 |
| 4 | Subject: [PATCH] fix CVE-2017-12837 |
| 5 | |
| 6 | Signed-off-by: Karl Williamson <khw@cpan.org> |
| 7 | Signed-off-by: Steve Hay <steve.m.hay@googlemail.com> |
| 8 | |
| 9 | CVE: CVE-2017-12837 |
| 10 | Upstream-Status: Backport |
| 11 | https://perl5.git.perl.org/perl.git/commitdiff/96c83ed78aeea1a0496dd2b2d935869a822dc8a5 |
| 12 | |
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 14 | --- |
| 15 | regcomp.c | 1 + |
| 16 | 1 file changed, 1 insertion(+) |
| 17 | |
| 18 | diff --git a/regcomp.c b/regcomp.c |
| 19 | index 5498d14..31ec383 100644 |
| 20 | --- a/regcomp.c |
| 21 | +++ b/regcomp.c |
| 22 | @@ -13021,6 +13021,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) |
| 23 | goto loopdone; |
| 24 | } |
| 25 | p = RExC_parse; |
| 26 | + RExC_parse = parse_start; |
| 27 | if (ender > 0xff) { |
| 28 | REQUIRE_UTF8(flagp); |
| 29 | } |
| 30 | -- |
| 31 | 1.8.3.1 |
| 32 | |