Skip to content

Commit 7eae1c5

Browse files
committed
Final file tidies for 10.31
1 parent 53a5884 commit 7eae1c5

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

ChangeLog

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Change Log for PCRE2
22
--------------------
33

44

5-
Version 10.31 13-January-2018
6-
-----------------------------
5+
Version 10.31 12-February-2018
6+
------------------------------
77

88
1. Fix typo (missing ]) in VMS code in pcre2test.c.
99

@@ -42,7 +42,7 @@ full path file names, which may be up to 2047 characters long.
4242
12. When an assertion contained (*ACCEPT) it caused all open capturing groups
4343
to be closed (as for a non-assertion ACCEPT), which was wrong and could lead to
4444
misbehaviour for subsequent references to groups that started outside the
45-
recursion. ACCEPT in an assertion now closes only those groups that were
45+
assertion. ACCEPT in an assertion now closes only those groups that were
4646
started within that assertion. Fixes oss-fuzz issues 3852 and 3891.
4747

4848
13. Multiline matching in pcre2grep was misbehaving if the pattern matched
@@ -129,18 +129,18 @@ call with zero length.
129129
element. Their actual memory is obtained dynamically, giving an ovector of
130130
appropriate length. However, they are defined in the structure as
131131
ovector[NUMBER], where NUMBER is large so that array bound checkers don't
132-
grumble. The value of NUMBER was 10000, but a fuzzer exceeded 5000 capturing
133-
groups, making the ovector larger than this. The number has been increased to
134-
131072, which allows for the maximum number of captures (65535) plus the
132+
grumble. The value of NUMBER was 10000, but a fuzzer exceeded 5000 capturing
133+
groups, making the ovector larger than this. The number has been increased to
134+
131072, which allows for the maximum number of captures (65535) plus the
135135
overall match. This fixes oss-fuzz issue 5415.
136136

137-
31. Auto-possessification at the end of a capturing group was dependent on what
138-
follows the group (e.g. /(a+)b/ would auto-possessify the a+) but this caused
139-
incorrect behaviour when the group was called recursively from elsewhere in the
137+
31. Auto-possessification at the end of a capturing group was dependent on what
138+
follows the group (e.g. /(a+)b/ would auto-possessify the a+) but this caused
139+
incorrect behaviour when the group was called recursively from elsewhere in the
140140
pattern where something different might follow. This bug is an unforseen
141141
consequence of change #1 for 10.30 - the implementation of backtracking into
142142
recursions. Iterators at the ends of capturing groups are no longer considered
143-
for auto-possessification if the pattern contains any recursions. Fixes
143+
for auto-possessification if the pattern contains any recursions. Fixes
144144
Bugzilla #2232.
145145

146146

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.31 13-January-2018
5-
-----------------------------
4+
Version 10.31 12-February-2018
5+
------------------------------
66

77
This is mainly a bugfix and tidying release (see ChangeLog for full details).
88
However, there are some minor enhancements.

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, [31])
13-
m4_define(pcre2_prerelease, [-RC1])
14-
m4_define(pcre2_date, [2018-01-11])
13+
m4_define(pcre2_prerelease, [])
14+
m4_define(pcre2_date, [2018-02-12])
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
@@ -210,7 +210,7 @@ sure both macros are undefined; an emulation function will then be used. */
210210
#define PACKAGE_NAME "PCRE2"
211211

212212
/* Define to the full name and version of this package. */
213-
#define PACKAGE_STRING "PCRE2 10.31-RC1"
213+
#define PACKAGE_STRING "PCRE2 10.31"
214214

215215
/* Define to the one symbol short name of this package. */
216216
#define PACKAGE_TARNAME "pcre2"
@@ -219,7 +219,7 @@ sure both macros are undefined; an emulation function will then be used. */
219219
#define PACKAGE_URL ""
220220

221221
/* Define to the version of this package. */
222-
#define PACKAGE_VERSION "10.31-RC1"
222+
#define PACKAGE_VERSION "10.31"
223223

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

341341
/* Version number of package */
342-
#define VERSION "10.31-RC1"
342+
#define VERSION "10.31"
343343

344344
/* Define to 1 if on MINIX. */
345345
/* #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 31
46-
#define PCRE2_PRERELEASE -RC1
47-
#define PCRE2_DATE 2018-01-11
46+
#define PCRE2_PRERELEASE
47+
#define PCRE2_DATE 2018-02-12
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 31
46-
#define PCRE2_PRERELEASE -RC1
47-
#define PCRE2_DATE 2018-01-11
46+
#define PCRE2_PRERELEASE
47+
#define PCRE2_DATE 2018-02-12
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

0 commit comments

Comments
 (0)