From cc18fd40c371ff113cdcc04469e97c73d349da76 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 27 Oct 2020 20:38:52 +0000 Subject: system/pcre2: Upgrade to 10.35 --- system/pcre2/CVE-2019-20454.patch | 50 --------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 system/pcre2/CVE-2019-20454.patch (limited to 'system/pcre2/CVE-2019-20454.patch') diff --git a/system/pcre2/CVE-2019-20454.patch b/system/pcre2/CVE-2019-20454.patch deleted file mode 100644 index bdec87294..000000000 --- a/system/pcre2/CVE-2019-20454.patch +++ /dev/null @@ -1,50 +0,0 @@ -Revision: 1091 -Author: ph10 -Date: Mon May 13 16:26:17 2019 UTC -URL: https://vcs.pcre.org/pcre2?view=revision&revision=1091 - -Fix crash when \X is used without UTF in JIT. - ---- a/testdata/testinput4 2019/05/11 11:43:39 1090 -+++ b/testdata/testinput4 2019/05/13 16:26:17 1091 -@@ -2480,4 +2480,7 @@ - /^(?'אABC'...)(?&אABC)/utf - 123123123456 - -+/\X*/ -+ \xF3aaa\xE4\xEA\xEB\xFEa -+ - # End of testinput4 ---- a/testdata/testoutput4 2019/05/11 11:43:39 1090 -+++ b/testdata/testoutput4 2019/05/13 16:26:17 1091 -@@ -4012,4 +4012,8 @@ - 0: 123123 - 1: 123 - -+/\X*/ -+ \xF3aaa\xE4\xEA\xEB\xFEa -+ 0: \xf3aaa\xe4\xea\xeb\xfea -+ - # End of testinput4 - -Revision: 1092 -Author: ph10 -Date: Mon May 13 16:38:18 2019 UTC -URL: https://vcs.pcre.org/pcre2?view=revision&revision=1092 - -Forgot this file in previous commit. Fixes JIT non-UTF bug. - ---- a/src/pcre2_jit_compile.c 2019/05/13 16:26:17 1091 -+++ b/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092 -@@ -8571,7 +8571,10 @@ - PCRE2_SPTR bptr; - uint32_t c; - --GETCHARINC(c, cc); -+/* Patch by PH */ -+/* GETCHARINC(c, cc); */ -+ -+c = *cc++; - #if PCRE2_CODE_UNIT_WIDTH == 32 - if (c >= 0x110000) - return NULL; -- cgit v1.2.3-70-g09d2