Skip to content

Commit bacf779

Browse files
author
Erlang/OTP
committed
Merge branch 'sverker/erts/pcre-update-10.46/OTP-19755' into maint-28
* sverker/erts/pcre-update-10.46/OTP-19755: erts: Update PCRE2 from 10.45 to 10.46
2 parents 096d102 + 03745dc commit bacf779

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

erts/emulator/pcre/pcre2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ POSSIBILITY OF SUCH DAMAGE.
4343
/* The current PCRE version information. */
4444

4545
#define PCRE2_MAJOR 10
46-
#define PCRE2_MINOR 45
46+
#define PCRE2_MINOR 46
4747
#define PCRE2_PRERELEASE
48-
#define PCRE2_DATE 2025-02-05
48+
#define PCRE2_DATE 2025-08-27
4949

5050
/* When an application links to a PCRE DLL in Windows, the symbols that are
5151
imported have to be identified as such. When building PCRE2, the appropriate

erts/emulator/pcre/pcre2_match.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6040,6 +6040,9 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
60406040
assert_accept_frame->offset_top * sizeof(PCRE2_SIZE));
60416041
Foffset_top = assert_accept_frame->offset_top;
60426042
Fmark = assert_accept_frame->mark;
6043+
mb->end_subject = Lsaved_end_subject;
6044+
mb->true_end_subject = mb->end_subject + Ltrue_end_extra;
6045+
mb->moptions = Lsaved_moptions;
60436046
break;
60446047
}
60456048

erts/emulator/pcre/vendor.info

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"homepage": "https://pcre2project.github.io/pcre2/",
1515
"licenseDeclared": "BSD-3-Clause",
1616
"name": "pcre2",
17-
"versionInfo": "10.45",
17+
"versionInfo": "10.46",
1818
"path": "./erts/emulator/pcre",
1919
"exclude": ["./erts/emulator/pcre/vendor.info",
2020
"./erts/emulator/pcre/README.pcre_update.md",
2121
"./erts/emulator/pcre/pcre.mk"],
22-
"supplier": "Person: Philip Hazel",
22+
"supplier": "Person: Nicholas Wilson",
2323
"purl": "pkg:generic/pcre2"
2424
}
2525
]

lib/stdlib/src/stdlib.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@
122122
dets]},
123123
{applications, [kernel]},
124124
{env, []},
125-
{runtime_dependencies, ["sasl-3.0","kernel-10.0","erts-16.0","crypto-4.5",
125+
{runtime_dependencies, ["sasl-3.0","kernel-10.0","erts-@OTP-19755@","crypto-4.5",
126126
"compiler-5.0", "syntax_tools-3.2.1"]}
127127
]}.

lib/stdlib/test/re_SUITE_data/testoutput2

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19664,6 +19664,18 @@ No match
1966419664
2:
1966519665
3:
1966619666

19667+
/(a)(*scs:(1)a(*ACCEPT))bbb/
19668+
abbb
19669+
0: abbb
19670+
1: a
19671+
19672+
/(a)(b+)(*scs:(1)a(*ACCEPT))(\2)/
19673+
abbb
19674+
0: abb
19675+
1: a
19676+
2: b
19677+
3: b
19678+
1966719679
# Tests for pcre2_set_optimize()
1966819680

1966919681
/abc/I,optimization_none

0 commit comments

Comments
 (0)