diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-26 17:05:41 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-31 06:47:35 +0000 |
commit | ddf45ac6344a79b23af2df33eb4abff27f748c94 (patch) | |
tree | 9b7022d0c9b421a95457389aa3dbbcb18dcdd428 /src/3rdparty/pcre2/src/pcre2_match.c | |
parent | minor: Clean up areMetricsTooLarge() conditions (diff) | |
download | qtbase-ddf45ac6344a79b23af2df33eb4abff27f748c94.tar.xz qtbase-ddf45ac6344a79b23af2df33eb4abff27f748c94.zip |
PCRE2: upgrade to 10.37
New upstream release.
Change-Id: I3a7e6c3d6706c940c0a279e4b63e1bfd96cc242c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 4ee4b7a8716dd2ffb7b67032aaa0766bc9b33bdb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_match.c')
-rw-r--r-- | src/3rdparty/pcre2/src/pcre2_match.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_match.c b/src/3rdparty/pcre2/src/pcre2_match.c index e3f78c2ca3..ed60517131 100644 --- a/src/3rdparty/pcre2/src/pcre2_match.c +++ b/src/3rdparty/pcre2/src/pcre2_match.c @@ -818,10 +818,12 @@ fprintf(stderr, "++ op=%d\n", *Fecode); /* N is now the frame of the recursion; the previous frame is at the OP_RECURSE position. Go back there, copying the current subject position - and mark, and move on past the OP_RECURSE. */ + and mark, and the start_match position (\K might have changed it), and + then move on past the OP_RECURSE. */ P->eptr = Feptr; P->mark = Fmark; + P->start_match = Fstart_match; F = P; Fecode += 1 + LINK_SIZE; continue; |