Skip to content

Commit e2a407c

Browse files
nikicnikic
committed
Revert "Update to PCRE2 10.35"
This reverts commit b419f96. This breaks the GCC build with -fcf-protection (default on Ubuntu at least).
1 parent af4ff75 commit e2a407c

39 files changed

+3261
-4595
lines changed

‎ext/pcre/pcre2lib/pcre2.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* This is the public header file for the PCRE library, second API, to be
66
#included by applications that call PCRE2 functions.
77
8-
Copyright (c) 2016-2020 University of Cambridge
8+
Copyright (c) 2016-2019 University of Cambridge
99
1010
-----------------------------------------------------------------------------
1111
Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
4242
/* The current PCRE version information. */
4343

4444
#define PCRE2_MAJOR 10
45-
#define PCRE2_MINOR 35
45+
#define PCRE2_MINOR 34
4646
#define PCRE2_PRERELEASE
47-
#define PCRE2_DATE 2020-05-09
47+
#define PCRE2_DATE 2019-11-21
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
@@ -181,9 +181,6 @@ pcre2_jit_match() ignores the latter since it bypasses all sanity checks). */
181181
#define PCRE2_SUBSTITUTE_OVERFLOW_LENGTH 0x00001000u /* pcre2_substitute() only */
182182
#define PCRE2_NO_JIT 0x00002000u /* Not for pcre2_dfa_match() */
183183
#define PCRE2_COPY_MATCHED_SUBJECT 0x00004000u
184-
#define PCRE2_SUBSTITUTE_LITERAL 0x00008000u /* pcre2_substitute() only */
185-
#define PCRE2_SUBSTITUTE_MATCHED 0x00010000u /* pcre2_substitute() only */
186-
#define PCRE2_SUBSTITUTE_REPLACEMENT_ONLY 0x00020000u /* pcre2_substitute() only */
187184

188185
/* Options for pcre2_pattern_convert(). */
189186

@@ -448,7 +445,6 @@ released, the numbers must not be changed. */
448445
#define PCRE2_CONFIG_HEAPLIMIT 12
449446
#define PCRE2_CONFIG_NEVER_BACKSLASH_C 13
450447
#define PCRE2_CONFIG_COMPILED_WIDTHS 14
451-
#define PCRE2_CONFIG_TABLES_LENGTH 15
452448

453449

454450
/* Types for code units in patterns and subject strings. */

‎ext/pcre/pcre2lib/pcre2_auto_possess.c

+14-20
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
77
88
Written by Philip Hazel
99
Original API code Copyright (c) 1997-2012 University of Cambridge
10-
New API code Copyright (c) 2016-2020 University of Cambridge
10+
New API code Copyright (c) 2016-2019 University of Cambridge
1111
1212
-----------------------------------------------------------------------------
1313
Redistribution and use in source and binary forms, with or without
@@ -292,7 +292,6 @@ possessification, and if so, fills a list with its properties.
292292
Arguments:
293293
code points to start of expression
294294
utf TRUE if in UTF mode
295-
ucp TRUE if in UCP mode
296295
fcc points to the case-flipping table
297296
list points to output list
298297
list[0] will be filled with the opcode
@@ -305,7 +304,7 @@ Returns: points to the start of the next opcode if *code is accepted
305304
*/
306305

307306
static PCRE2_SPTR
308-
get_chr_property_list(PCRE2_SPTR code, BOOL utf, BOOL ucp, const uint8_t *fcc,
307+
get_chr_property_list(PCRE2_SPTR code, BOOL utf, const uint8_t *fcc,
309308
uint32_t *list)
310309
{
311310
PCRE2_UCHAR c = *code;
@@ -317,8 +316,7 @@ uint32_t chr;
317316
uint32_t *clist_dest;
318317
const uint32_t *clist_src;
319318
#else
320-
(void)utf; /* Suppress "unused parameter" compiler warnings */
321-
(void)ucp;
319+
(void)utf; /* Suppress "unused parameter" compiler warning */
322320
#endif
323321

324322
list[0] = c;
@@ -398,7 +396,7 @@ switch(c)
398396
list[2] = chr;
399397

400398
#ifdef SUPPORT_UNICODE
401-
if (chr < 128 || (chr < 256 && !utf && !ucp))
399+
if (chr < 128 || (chr < 256 && !utf))
402400
list[3] = fcc[chr];
403401
else
404402
list[3] = UCD_OTHERCASE(chr);
@@ -505,7 +503,6 @@ which case the base cannot be possessified.
505503
Arguments:
506504
code points to the byte code
507505
utf TRUE in UTF mode
508-
ucp TRUE in UCP mode
509506
cb compile data block
510507
base_list the data list of the base opcode
511508
base_end the end of the base opcode
@@ -515,7 +512,7 @@ Returns: TRUE if the auto-possessification is possible
515512
*/
516513

517514
static BOOL
518-
compare_opcodes(PCRE2_SPTR code, BOOL utf, BOOL ucp, const compile_block *cb,
515+
compare_opcodes(PCRE2_SPTR code, BOOL utf, const compile_block *cb,
519516
const uint32_t *base_list, PCRE2_SPTR base_end, int *rec_limit)
520517
{
521518
PCRE2_UCHAR c;
@@ -654,7 +651,7 @@ for(;;)
654651

655652
while (*next_code == OP_ALT)
656653
{
657-
if (!compare_opcodes(code, utf, ucp, cb, base_list, base_end, rec_limit))
654+
if (!compare_opcodes(code, utf, cb, base_list, base_end, rec_limit))
658655
return FALSE;
659656
code = next_code + 1 + LINK_SIZE;
660657
next_code += GET(next_code, 1);
@@ -675,8 +672,7 @@ for(;;)
675672
/* The bracket content will be checked by the OP_BRA/OP_CBRA case above. */
676673

677674
next_code += 1 + LINK_SIZE;
678-
if (!compare_opcodes(next_code, utf, ucp, cb, base_list, base_end,
679-
rec_limit))
675+
if (!compare_opcodes(next_code, utf, cb, base_list, base_end, rec_limit))
680676
return FALSE;
681677

682678
code += PRIV(OP_lengths)[c];
@@ -692,7 +688,7 @@ for(;;)
692688
/* We now have the next appropriate opcode to compare with the base. Check
693689
for a supported opcode, and load its properties. */
694690

695-
code = get_chr_property_list(code, utf, ucp, cb->fcc, list);
691+
code = get_chr_property_list(code, utf, cb->fcc, list);
696692
if (code == NULL) return FALSE; /* Unsupported */
697693

698694
/* If either opcode is a small character list, set pointers for comparing
@@ -1104,22 +1100,21 @@ leaving the remainder of the pattern unpossessified.
11041100
11051101
Arguments:
11061102
code points to start of the byte code
1103+
utf TRUE in UTF mode
11071104
cb compile data block
11081105
11091106
Returns: 0 for success
11101107
-1 if a non-existant opcode is encountered
11111108
*/
11121109

11131110
int
1114-
PRIV(auto_possessify)(PCRE2_UCHAR *code, const compile_block *cb)
1111+
PRIV(auto_possessify)(PCRE2_UCHAR *code, BOOL utf, const compile_block *cb)
11151112
{
11161113
PCRE2_UCHAR c;
11171114
PCRE2_SPTR end;
11181115
PCRE2_UCHAR *repeat_opcode;
11191116
uint32_t list[8];
11201117
int rec_limit = 1000; /* Was 10,000 but clang+ASAN uses a lot of stack. */
1121-
BOOL utf = (cb->external_options & PCRE2_UTF) != 0;
1122-
BOOL ucp = (cb->external_options & PCRE2_UCP) != 0;
11231118

11241119
for (;;)
11251120
{
@@ -1131,11 +1126,10 @@ for (;;)
11311126
{
11321127
c -= get_repeat_base(c) - OP_STAR;
11331128
end = (c <= OP_MINUPTO) ?
1134-
get_chr_property_list(code, utf, ucp, cb->fcc, list) : NULL;
1129+
get_chr_property_list(code, utf, cb->fcc, list) : NULL;
11351130
list[1] = c == OP_STAR || c == OP_PLUS || c == OP_QUERY || c == OP_UPTO;
11361131

1137-
if (end != NULL && compare_opcodes(end, utf, ucp, cb, list, end,
1138-
&rec_limit))
1132+
if (end != NULL && compare_opcodes(end, utf, cb, list, end, &rec_limit))
11391133
{
11401134
switch(c)
11411135
{
@@ -1187,11 +1181,11 @@ for (;;)
11871181
if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
11881182
{
11891183
/* end must not be NULL. */
1190-
end = get_chr_property_list(code, utf, ucp, cb->fcc, list);
1184+
end = get_chr_property_list(code, utf, cb->fcc, list);
11911185

11921186
list[1] = (c & 1) == 0;
11931187

1194-
if (compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit))
1188+
if (compare_opcodes(end, utf, cb, list, end, &rec_limit))
11951189
{
11961190
switch (c)
11971191
{

‎ext/pcre/pcre2lib/pcre2_chartables.c

+17-21
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22
* Perl-Compatible Regular Expressions *
33
*************************************************/
44

5-
/* This file was automatically written by the pcre2_dftables auxiliary
5+
/* This file was automatically written by the dftables auxiliary
66
program. It contains character tables that are used when no external
77
tables are passed to PCRE2 by the application that calls it. The tables
88
are used only for characters whose code values are less than 256. */
99

10-
/* This set of tables was written in the C locale. */
11-
12-
/* The pcre2_ftables program (which is distributed with PCRE2) can be used
13-
to build alternative versions of this file. This is necessary if you are
10+
/*The dftables program (which is distributed with PCRE2) can be used to
11+
build alternative versions of this file. This is necessary if you are
1412
running in an EBCDIC environment, or if you want to default to a different
15-
encoding, for example ISO-8859-1. When pcre2_dftables is run, it creates
16-
these tables in the "C" locale by default. This happens automatically if
17-
PCRE2 is configured with --enable-rebuild-chartables. However, you can run
18-
pcre2_dftables manually with the -L option to build tables using the LC_ALL
19-
locale. */
13+
encoding, for example ISO-8859-1. When dftables is run, it creates these
14+
tables in the current locale. This happens automatically if PCRE2 is
15+
configured with --enable-rebuild-chartables. */
2016

2117
/* The following #include is present because without it gcc 4.x may remove
2218
the array definition from the final binary if PCRE2 is built into a static
@@ -106,54 +102,54 @@ const uint8_t PRIV(default_tables)[] = {
106102
/* This table contains bit maps for various character classes. Each map is 32
107103
bytes long and the bits run from the least significant end of each byte. The
108104
classes that have their own maps are: space, xdigit, digit, upper, lower, word,
109-
graph, print, punct, and cntrl. Other classes are built from combinations. */
105+
graph print, punct, and cntrl. Other classes are built from combinations. */
110106

111-
0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00, /* space */
107+
0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
112108
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
113109
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
114110
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
115111

116-
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, /* xdigit */
112+
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
117113
0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
118114
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
119115
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
120116

121-
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, /* digit */
117+
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
122118
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
123119
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
124120
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
125121

126-
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* upper */
122+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
127123
0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
128124
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
129125
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
130126

131-
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* lower */
127+
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
132128
0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
133129
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
134130
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
135131

136-
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, /* word */
132+
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
137133
0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
138134
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
139135
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
140136

141-
0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff, /* graph */
137+
0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
142138
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
143139
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
144140
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
145141

146-
0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff, /* print */
142+
0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
147143
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
148144
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
149145
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
150146

151-
0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc, /* punct */
147+
0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
152148
0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
153149
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
154150
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
155151

156-
0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00, /* cntrl */
152+
0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
157153
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
158154
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
159155
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

0 commit comments

Comments
 (0)