Restore single character repetition optimization in JIT

This commit is contained in:
Petr Písař 2021-02-19 16:11:23 +01:00
parent 223b0aaf60
commit 9038664a69
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From 29dd457d21ec0350bd9d55f33c0e53ca285d52c2 Mon Sep 17 00:00:00 2001
From: zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>
Date: Fri, 19 Feb 2021 09:20:37 +0000
Subject: [PATCH] Restore single character repetition optimization in JIT.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1302 6239d852-aaf2-0410-a92c-79f79f948069
Petr Písař: Ported to 10.36.
---
src/pcre2_jit_compile.c | 2 +-
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
index 1977d28..3281464 100644
--- a/src/pcre2_jit_compile.c
+++ b/src/pcre2_jit_compile.c
@@ -1226,7 +1226,7 @@ while (cc < ccend)
return TRUE;
}
-#define EARLY_FAIL_ENHANCE_MAX (1 + 1)
+#define EARLY_FAIL_ENHANCE_MAX (1 + 3)
/*
start:
--
2.26.2

View File

@ -60,6 +60,9 @@ Patch1: pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.pat
Patch2: pcre2-10.36-Fix-some-numerical-checking-bugs-Bugzilla-2690.patch Patch2: pcre2-10.36-Fix-some-numerical-checking-bugs-Bugzilla-2690.patch
# Fix a mismatch if \K was involved in a recursion, in upstream after 10.36 # Fix a mismatch if \K was involved in a recursion, in upstream after 10.36
Patch3: pcre2-10.36-Fix-K-within-recursion-bug-in-interpreter.patch Patch3: pcre2-10.36-Fix-K-within-recursion-bug-in-interpreter.patch
# Restore single character repetition optimization in JIT, upstream bug #2698,
# in upstream after 10.36
Patch4: pcre2-10.36-Restore-single-character-repetition-optimization-in-.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: coreutils BuildRequires: coreutils
@ -265,6 +268,7 @@ make %{?_smp_mflags} check VERBOSE=yes
%changelog %changelog
* Fri Feb 19 2021 Petr Pisar <ppisar@redhat.com> - 10.36-4 * Fri Feb 19 2021 Petr Pisar <ppisar@redhat.com> - 10.36-4
- Fix a mismatch if \K was involved in a recursion - Fix a mismatch if \K was involved in a recursion
- Restore single character repetition optimization in JIT (upstream bug #2698)
* Tue Feb 02 2021 Petr Pisar <ppisar@redhat.com> - 10.36-3 * Tue Feb 02 2021 Petr Pisar <ppisar@redhat.com> - 10.36-3
- Fix misparsing long numbers as a backreference and a number without - Fix misparsing long numbers as a backreference and a number without