Skip to content

Commit 84b78c0

Browse files
authored
Update pcre2lib from 10.45 to 10.46 (#19618)
There is a new release of pcre2lib to address a security issue [1]. It only affects version 10.45. Only the master branch has version 10.45. [1] https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.46
1 parent b27d919 commit 84b78c0

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ PHP NEWS
55
- Opcache:
66
. Fixed bug GH-19486 (Incorrect opline after deoptimization). (Arnaud)
77

8+
- PCRE:
9+
. Upgraded to pcre2lib from 10.45 to 10.46. (nielsdos)
10+
811
- Session:
912
. Fix RC violation of session SID constant deprecation attribute. (ilutov)
1013

UPGRADING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ PHP 8.5 UPGRADE NOTES
780780
RFC: https://wiki.php.net/rfc/url_parsing_api
781781

782782
- PCRE:
783-
. Upgraded pcre2lib from 10.44 to 10.45.
783+
. Upgraded pcre2lib from 10.44 to 10.46.
784784

785785
- PDO_Sqlite:
786786
. Increased minimum release version support from 3.7.7 to 3.7.17.

ext/pcre/pcre2lib/pcre2.h

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

4444
#define PCRE2_MAJOR 10
45-
#define PCRE2_MINOR 45
45+
#define PCRE2_MINOR 46
4646
#define PCRE2_PRERELEASE
47-
#define PCRE2_DATE 2025-02-05
47+
#define PCRE2_DATE 2025-08-27
4848

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

ext/pcre/pcre2lib/pcre2_match.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5824,6 +5824,9 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
58245824
assert_accept_frame->offset_top * sizeof(PCRE2_SIZE));
58255825
Foffset_top = assert_accept_frame->offset_top;
58265826
Fmark = assert_accept_frame->mark;
5827+
mb->end_subject = Lsaved_end_subject;
5828+
mb->true_end_subject = mb->end_subject + Ltrue_end_extra;
5829+
mb->moptions = Lsaved_moptions;
58275830
break;
58285831
}
58295832

0 commit comments

Comments
 (0)