Skip to content

Commit bea3a10

Browse files
committed
Final file updates for 10.23.
1 parent f19d6e1 commit bea3a10

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

ChangeLog

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ compliant and unique.
219219
wrong name.
220220

221221
27. In pcre2test, give some offset information for errors in hex patterns.
222-
This uses the C99 formatting sequence %td, except for MSVC which doesn't
222+
This uses the C99 formatting sequence %td, except for MSVC which doesn't
223223
support it - %lu is used instead.
224224

225225
28. Implemented pcre2_code_copy_with_tables(), and added pushtablescopy to
@@ -338,23 +338,23 @@ modules.
338338
* LC_ALL was displayed as "LCC_ALL";
339339
* numbers 11, 12 & 13 should end in "th";
340340
* use double quotes in usage message.
341-
342-
53. When autopossessifying, skip empty branches without recursion, to reduce
343-
stack usage for the benefit of clang with -fsanitize-address, which uses huge
344-
stack frames. Example pattern: /X?(R||){3335}/. Fixes oss-fuzz issue 553.
345-
346-
54. A pattern with very many explicit back references to a group that is a long
347-
way from the start of the pattern could take a long time to compile because
348-
searching for the referenced group in order to find the minimum length was
349-
being done repeatedly. Now up to 128 group minimum lengths are cached and the
350-
attempt to find a minimum length is abandoned if there is a back reference to a
351-
group whose number is greater than 128. (In that case, the pattern is so
352-
complicated that this optimization probably isn't worth it.) This fixes
341+
342+
53. When autopossessifying, skip empty branches without recursion, to reduce
343+
stack usage for the benefit of clang with -fsanitize-address, which uses huge
344+
stack frames. Example pattern: /X?(R||){3335}/. Fixes oss-fuzz issue 553.
345+
346+
54. A pattern with very many explicit back references to a group that is a long
347+
way from the start of the pattern could take a long time to compile because
348+
searching for the referenced group in order to find the minimum length was
349+
being done repeatedly. Now up to 128 group minimum lengths are cached and the
350+
attempt to find a minimum length is abandoned if there is a back reference to a
351+
group whose number is greater than 128. (In that case, the pattern is so
352+
complicated that this optimization probably isn't worth it.) This fixes
353353
oss-fuzz issue 557.
354354

355-
55. Issue 32 for 10.22 below was not correctly fixed. If pcre2grep in multiline
356-
mode with --only-matching matched several lines, it restarted scanning at the
357-
next line instead of moving on to the end of the matched string, which can be
355+
55. Issue 32 for 10.22 below was not correctly fixed. If pcre2grep in multiline
356+
mode with --only-matching matched several lines, it restarted scanning at the
357+
next line instead of moving on to the end of the matched string, which can be
358358
several lines after the start.
359359

360360
56. Applied Jason Hood's new patch for RunGrepTest.bat that updates it in line

NEWS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
News about PCRE2 releases
22
-------------------------
33

4-
Version 10.23 16-January-2017
5-
-----------------------------
4+
Version 10.23 14-February-2017
5+
------------------------------
66

77
1. ChangeLog has the details of a lot of bug fixes and tidies.
88

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
1010

1111
m4_define(pcre2_major, [10])
1212
m4_define(pcre2_minor, [23])
13-
m4_define(pcre2_prerelease, [-RC1])
14-
m4_define(pcre2_date, [2017-01-16])
13+
m4_define(pcre2_prerelease, [])
14+
m4_define(pcre2_date, [2017-02-14])
1515

1616
# NOTE: The CMakeLists.txt file searches for the above variables in the first
1717
# 50 lines of this file. Please update that if the variables above are moved.

src/config.h.generic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ sure both macros are undefined; an emulation function will then be used. */
212212
#define PACKAGE_NAME "PCRE2"
213213

214214
/* Define to the full name and version of this package. */
215-
#define PACKAGE_STRING "PCRE2 10.23-RC1"
215+
#define PACKAGE_STRING "PCRE2 10.23"
216216

217217
/* Define to the one symbol short name of this package. */
218218
#define PACKAGE_TARNAME "pcre2"
@@ -221,7 +221,7 @@ sure both macros are undefined; an emulation function will then be used. */
221221
#define PACKAGE_URL ""
222222

223223
/* Define to the version of this package. */
224-
#define PACKAGE_VERSION "10.23-RC1"
224+
#define PACKAGE_VERSION "10.23"
225225

226226
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
227227
parentheses (of any kind) in a pattern. This limits the amount of system
@@ -336,7 +336,7 @@ sure both macros are undefined; an emulation function will then be used. */
336336
#endif
337337

338338
/* Version number of package */
339-
#define VERSION "10.23-RC1"
339+
#define VERSION "10.23"
340340

341341
/* Define to 1 if on MINIX. */
342342
/* #undef _MINIX */

src/pcre2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
4343

4444
#define PCRE2_MAJOR 10
4545
#define PCRE2_MINOR 23
46-
#define PCRE2_PRERELEASE -RC1
47-
#define PCRE2_DATE 2017-01-16
46+
#define PCRE2_PRERELEASE
47+
#define PCRE2_DATE 2017-02-14
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

src/pcre2.h.generic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
4343

4444
#define PCRE2_MAJOR 10
4545
#define PCRE2_MINOR 23
46-
#define PCRE2_PRERELEASE -RC1
47-
#define PCRE2_DATE 2017-01-16
46+
#define PCRE2_PRERELEASE
47+
#define PCRE2_DATE 2017-02-14
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

src/pcre2_compile.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,14 +1226,14 @@ if (allow_sign >= 0 && ptr < ptrend)
12261226
{
12271227
sign = +1;
12281228
max_value -= allow_sign;
1229-
ptr++;
1229+
ptr++;
12301230
}
12311231
else if (*ptr == CHAR_MINUS)
1232-
{
1233-
sign = -1;
1234-
ptr++;
1235-
}
1236-
}
1232+
{
1233+
sign = -1;
1234+
ptr++;
1235+
}
1236+
}
12371237

12381238
if (ptr >= ptrend || !IS_DIGIT(*ptr)) return FALSE;
12391239
while (ptr < ptrend && IS_DIGIT(*ptr))
@@ -2384,7 +2384,7 @@ while (ptr < ptrend)
23842384
/* This is the length in characters */
23852385
verbnamelength = (PCRE2_SIZE)(parsed_pattern - verblengthptr - 1);
23862386
/* But the limit on the length is in code units */
2387-
if (ptr - verbnamestart - 1 > MAX_MARK)
2387+
if (ptr - verbnamestart - 1 > (int)MAX_MARK)
23882388
{
23892389
ptr--;
23902390
errorcode = ERR76;

0 commit comments

Comments
 (0)