Skip to content

Commit 32e709b

Browse files
PhilipHazelPhilipHazel
committed
Withdraw previous fix; update generic config
1 parent a3ebe90 commit 32e709b

File tree

5 files changed

+47
-50
lines changed

5 files changed

+47
-50
lines changed

‎.github/workflows/build.yml

+12-15
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ jobs:
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v3
12-
12+
1313
- name: Prepare
1414
run: ./autogen.sh
15-
15+
1616
- name: Configure
1717
run: ./configure CPPFLAGS='-Wall -Wextra' --enable-jit --enable-pcre2-16 --enable-pcre2-32
18-
18+
1919
- name: Build
2020
run: make -j2
21-
21+
2222
- name: Test (main test script)
2323
run: ./RunTest
2424

@@ -27,30 +27,30 @@ jobs:
2727

2828
- name: Test (pcre2grep test script)
2929
run: ./RunGrepTest
30-
30+
3131
- name: Test (pcre2posix program)
3232
run: ./pcre2posix_test -v
3333

3434
alpine:
3535
name: alpine
3636
runs-on: ubuntu-latest
37-
container: alpine
37+
container: alpine
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v3
41-
41+
4242
- name: Setup
4343
run: apk add --no-cache automake autoconf gcc libtool make musl-dev #musl-locales
44-
44+
4545
- name: Prepare
4646
run: ./autogen.sh
47-
47+
4848
- name: Configure
4949
run: ./configure CPPFLAGS='-Wall -Wextra' --enable-jit --enable-pcre2-16 --enable-pcre2-32
50-
50+
5151
- name: Build
5252
run: make -j2
53-
53+
5454
- name: Test (main test script)
5555
run: ./RunTest
5656

@@ -69,9 +69,6 @@ jobs:
6969
steps:
7070
- name: Checkout
7171
uses: actions/checkout@v3
72-
73-
- name: Prepare
74-
run: ./autogen.sh
7572

7673
- name: Configure
7774
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_C_FLAGS='-Wall -Wextra' -B build
@@ -99,7 +96,7 @@ jobs:
9996
cd build
10097
./pcre2posix_test -v
10198
102-
windows:
99+
windows:
103100
name: 32bit Windows
104101
runs-on: windows-latest
105102
steps:

‎ChangeLog

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ example pattern is: /(((?<=123?456456|ABC)))(?<=\2)/
2727
(d) Made the output in standalone mode more readable.
2828

2929
(e) General code tidies.
30-
31-
3. Increase the maximum length of a name for a group from 32 to 128 because
32-
there is a user for whom 32 is too small.
30+
31+
3. Increase the maximum length of a name for a group from 32 to 128 because
32+
there is a user for whom 32 is too small.
3333

3434

3535
Version 10.43 16-February-2024

‎doc/pcre2.txt

+30-30
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ REVISION
189189

190190
PCRE2 10.38 27 August 2021 PCRE2(3)
191191
------------------------------------------------------------------------------
192-
193-
192+
193+
194194

195195
PCRE2API(3) Library Functions Manual PCRE2API(3)
196196

@@ -4004,8 +4004,8 @@ REVISION
40044004

40054005
PCRE2 10.43 27 January 2024 PCRE2API(3)
40064006
------------------------------------------------------------------------------
4007-
4008-
4007+
4008+
40094009

40104010
PCRE2BUILD(3) Library Functions Manual PCRE2BUILD(3)
40114011

@@ -4630,8 +4630,8 @@ REVISION
46304630

46314631
PCRE2 10.43 24 November PCRE2BUILD(3)
46324632
------------------------------------------------------------------------------
4633-
4634-
4633+
4634+
46354635

46364636
PCRE2CALLOUT(3) Library Functions Manual PCRE2CALLOUT(3)
46374637

@@ -5064,8 +5064,8 @@ REVISION
50645064

50655065
PCRE2 10.43 19 January 2024 PCRE2CALLOUT(3)
50665066
------------------------------------------------------------------------------
5067-
5068-
5067+
5068+
50695069

50705070
PCRE2COMPAT(3) Library Functions Manual PCRE2COMPAT(3)
50715071

@@ -5298,8 +5298,8 @@ REVISION
52985298

52995299
PCRE2 10.43 30 November 2023 PCRE2COMPAT(3)
53005300
------------------------------------------------------------------------------
5301-
5302-
5301+
5302+
53035303

53045304
PCRE2JIT(3) Library Functions Manual PCRE2JIT(3)
53055305

@@ -5745,8 +5745,8 @@ REVISION
57455745

57465746
PCRE2 10.43 21 February 2024 PCRE2JIT(3)
57475747
------------------------------------------------------------------------------
5748-
5749-
5748+
5749+
57505750

57515751
PCRE2LIMITS(3) Library Functions Manual PCRE2LIMITS(3)
57525752

@@ -5829,8 +5829,8 @@ REVISION
58295829

58305830
PCRE2 10.43 1 August 2023 PCRE2LIMITS(3)
58315831
------------------------------------------------------------------------------
5832-
5833-
5832+
5833+
58345834

58355835
PCRE2MATCHING(3) Library Functions Manual PCRE2MATCHING(3)
58365836

@@ -6058,8 +6058,8 @@ REVISION
60586058

60596059
PCRE2 10.43 19 January 2024 PCRE2MATCHING(3)
60606060
------------------------------------------------------------------------------
6061-
6062-
6061+
6062+
60636063

60646064
PCRE2PARTIAL(3) Library Functions Manual PCRE2PARTIAL(3)
60656065

@@ -6442,8 +6442,8 @@ REVISION
64426442

64436443
PCRE2 10.34 04 September 2019 PCRE2PARTIAL(3)
64446444
------------------------------------------------------------------------------
6445-
6446-
6445+
6446+
64476447

64486448
PCRE2PATTERN(3) Library Functions Manual PCRE2PATTERN(3)
64496449

@@ -10006,8 +10006,8 @@ REVISION
1000610006

1000710007
PCRE2 10.44 11 March 2024 PCRE2PATTERN(3)
1000810008
------------------------------------------------------------------------------
10009-
10010-
10009+
10010+
1001110011

1001210012
PCRE2PERFORM(3) Library Functions Manual PCRE2PERFORM(3)
1001310013

@@ -10262,8 +10262,8 @@ REVISION
1026210262

1026310263
PCRE2 10.41 27 July 2022 PCRE2PERFORM(3)
1026410264
------------------------------------------------------------------------------
10265-
10266-
10265+
10266+
1026710267

1026810268
PCRE2POSIX(3) Library Functions Manual PCRE2POSIX(3)
1026910269

@@ -10621,8 +10621,8 @@ REVISION
1062110621

1062210622
PCRE2 10.43 19 January 2024 PCRE2POSIX(3)
1062310623
------------------------------------------------------------------------------
10624-
10625-
10624+
10625+
1062610626

1062710627
PCRE2SAMPLE(3) Library Functions Manual PCRE2SAMPLE(3)
1062810628

@@ -10907,8 +10907,8 @@ REVISION
1090710907

1090810908
PCRE2 10.32 27 June 2018 PCRE2SERIALIZE(3)
1090910909
------------------------------------------------------------------------------
10910-
10911-
10910+
10911+
1091210912

1091310913
PCRE2SYNTAX(3) Library Functions Manual PCRE2SYNTAX(3)
1091410914

@@ -11494,8 +11494,8 @@ REVISION
1149411494

1149511495
PCRE2 10.43 12 October 2023 PCRE2SYNTAX(3)
1149611496
------------------------------------------------------------------------------
11497-
11498-
11497+
11498+
1149911499

1150011500
PCRE2UNICODE(3) Library Functions Manual PCRE2UNICODE(3)
1150111501

@@ -11960,5 +11960,5 @@ REVISION
1196011960

1196111961
PCRE2 10.43 04 February 2023 PCRE2UNICODE(3)
1196211962
------------------------------------------------------------------------------
11963-
11964-
11963+
11964+

‎src/config.h.generic

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ sure both macros are undefined; an emulation function will then be used. */
215215
Care must be taken if it is increased, because it guards against integer
216216
overflow caused by enormously large patterns. */
217217
#ifndef MAX_NAME_SIZE
218-
#define MAX_NAME_SIZE 32
218+
#define MAX_NAME_SIZE 128
219219
#endif
220220

221221
/* The value of MAX_VARLOOKBEHIND specifies the default maximum length, in

‎src/pcre2_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7549,7 +7549,7 @@ for (;; pptr++)
75497549
if (lengthptr != NULL)
75507550
{
75517551
PCRE2_SIZE delta;
7552-
if (PRIV(ckd_smul)(&delta, repeat_min - 1,
7552+
if (PRIV(ckd_smul)(&delta, repeat_min - 1,
75537553
(int)length_prevgroup) ||
75547554
OFLOW_MAX - *lengthptr < delta)
75557555
{

0 commit comments

Comments
 (0)