Withdraw previous fix; update generic config

PCRE2Project · Mar 11, 2024 · 32e709b · 32e709b
1 parent a3ebe90
commit 32e709b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,16 +9,16 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
+
       - name: Prepare
         run: ./autogen.sh
-        
+
       - name: Configure
         run: ./configure CPPFLAGS='-Wall -Wextra' --enable-jit --enable-pcre2-16 --enable-pcre2-32
-        
+
       - name: Build
         run: make -j2
-        
+
       - name: Test (main test script)
         run: ./RunTest
 
@@ -27,30 +27,30 @@ jobs:
 
       - name: Test (pcre2grep test script)
         run: ./RunGrepTest
-    
+
       - name: Test (pcre2posix program)
         run: ./pcre2posix_test -v
 
   alpine:
     name: alpine
     runs-on: ubuntu-latest
-    container: alpine 
+    container: alpine
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
+
       - name: Setup
         run: apk add --no-cache automake autoconf gcc libtool make musl-dev #musl-locales
-        
+
       - name: Prepare
         run: ./autogen.sh
-        
+
       - name: Configure
         run: ./configure CPPFLAGS='-Wall -Wextra' --enable-jit --enable-pcre2-16 --enable-pcre2-32
-        
+
       - name: Build
         run: make -j2
-        
+
       - name: Test (main test script)
         run: ./RunTest
 
@@ -69,9 +69,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      - name: Prepare
-        run: ./autogen.sh
 
       - name: Configure
         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:
           cd build
           ./pcre2posix_test -v
 
-  windows:      
+  windows:
     name: 32bit Windows
     runs-on: windows-latest
     steps:

diff --git a/ChangeLog b/ChangeLog
@@ -27,9 +27,9 @@ example pattern is: /(((?<=123?456456|ABC)))(?<=\2)/
    (d) Made the output in standalone mode more readable.
 
    (e) General code tidies.
-   
-3. Increase the maximum length of a name for a group from 32 to 128 because 
-there is a user for whom 32 is too small. 
+
+3. Increase the maximum length of a name for a group from 32 to 128 because
+there is a user for whom 32 is too small.
 
 
 Version 10.43 16-February-2024

diff --git a/doc/pcre2.txt b/doc/pcre2.txt
@@ -189,8 +189,8 @@ REVISION
 
 PCRE2 10.38                     27 August 2021                        PCRE2(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2API(3)                Library Functions Manual                PCRE2API(3)
 
@@ -4004,8 +4004,8 @@ REVISION
 
 PCRE2 10.43                     27 January 2024                    PCRE2API(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2BUILD(3)              Library Functions Manual              PCRE2BUILD(3)
 
@@ -4630,8 +4630,8 @@ REVISION
 
 PCRE2 10.43                       24 November                    PCRE2BUILD(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2CALLOUT(3)            Library Functions Manual            PCRE2CALLOUT(3)
 
@@ -5064,8 +5064,8 @@ REVISION
 
 PCRE2 10.43                     19 January 2024                PCRE2CALLOUT(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2COMPAT(3)             Library Functions Manual             PCRE2COMPAT(3)
 
@@ -5298,8 +5298,8 @@ REVISION
 
 PCRE2 10.43                    30 November 2023                 PCRE2COMPAT(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2JIT(3)                Library Functions Manual                PCRE2JIT(3)
 
@@ -5745,8 +5745,8 @@ REVISION
 
 PCRE2 10.43                    21 February 2024                    PCRE2JIT(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2LIMITS(3)             Library Functions Manual             PCRE2LIMITS(3)
 
@@ -5829,8 +5829,8 @@ REVISION
 
 PCRE2 10.43                      1 August 2023                  PCRE2LIMITS(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2MATCHING(3)           Library Functions Manual           PCRE2MATCHING(3)
 
@@ -6058,8 +6058,8 @@ REVISION
 
 PCRE2 10.43                     19 January 2024               PCRE2MATCHING(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2PARTIAL(3)            Library Functions Manual            PCRE2PARTIAL(3)
 
@@ -6442,8 +6442,8 @@ REVISION
 
 PCRE2 10.34                    04 September 2019               PCRE2PARTIAL(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2PATTERN(3)            Library Functions Manual            PCRE2PATTERN(3)
 
@@ -10006,8 +10006,8 @@ REVISION
 
 PCRE2 10.44                      11 March 2024                 PCRE2PATTERN(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2PERFORM(3)            Library Functions Manual            PCRE2PERFORM(3)
 
@@ -10262,8 +10262,8 @@ REVISION
 
 PCRE2 10.41                      27 July 2022                  PCRE2PERFORM(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2POSIX(3)              Library Functions Manual              PCRE2POSIX(3)
 
@@ -10621,8 +10621,8 @@ REVISION
 
 PCRE2 10.43                     19 January 2024                  PCRE2POSIX(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2SAMPLE(3)             Library Functions Manual             PCRE2SAMPLE(3)
 
@@ -10907,8 +10907,8 @@ REVISION
 
 PCRE2 10.32                      27 June 2018                PCRE2SERIALIZE(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2SYNTAX(3)             Library Functions Manual             PCRE2SYNTAX(3)
 
@@ -11494,8 +11494,8 @@ REVISION
 
 PCRE2 10.43                     12 October 2023                 PCRE2SYNTAX(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
 
 PCRE2UNICODE(3)            Library Functions Manual            PCRE2UNICODE(3)
 
@@ -11960,5 +11960,5 @@ REVISION
 
 PCRE2 10.43                    04 February 2023                PCRE2UNICODE(3)
 ------------------------------------------------------------------------------
- 
- 
+
+
diff --git a/src/config.h.generic b/src/config.h.generic
@@ -215,7 +215,7 @@ sure both macros are undefined; an emulation function will then be used. */
    Care must be taken if it is increased, because it guards against integer
    overflow caused by enormously large patterns. */
 #ifndef MAX_NAME_SIZE
-#define MAX_NAME_SIZE 32
+#define MAX_NAME_SIZE 128
 #endif
 
 /* The value of MAX_VARLOOKBEHIND specifies the default maximum length, in

diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
@@ -7549,7 +7549,7 @@ for (;; pptr++)
             if (lengthptr != NULL)
               {
               PCRE2_SIZE delta;
-              if (PRIV(ckd_smul)(&delta, repeat_min - 1, 
+              if (PRIV(ckd_smul)(&delta, repeat_min - 1,
                                  (int)length_prevgroup) ||
                   OFLOW_MAX - *lengthptr < delta)
                 {