1 |
ChangeLog for PCRE |
ChangeLog for PCRE |
2 |
------------------ |
------------------ |
3 |
|
|
4 |
Version 7.7 05-Mar-08 |
Version 8.11 10-Oct-2010 |
5 |
|
------------------------ |
6 |
|
|
7 |
|
1. (*THEN) was not working properly if there were untried alternatives prior |
8 |
|
to it in the current branch. For example, in ((a|b)(*THEN)(*F)|c..) it |
9 |
|
backtracked to try for "b" instead of moving to the next alternative branch |
10 |
|
at the same level (in this case, to look for "c"). The Perl documentation |
11 |
|
is clear that when (*THEN) is backtracked onto, it goes to the "next |
12 |
|
alternative in the innermost enclosing group". |
13 |
|
|
14 |
|
|
15 |
|
Version 8.10 25-Jun-2010 |
16 |
|
------------------------ |
17 |
|
|
18 |
|
1. Added support for (*MARK:ARG) and for ARG additions to PRUNE, SKIP, and |
19 |
|
THEN. |
20 |
|
|
21 |
|
2. (*ACCEPT) was not working when inside an atomic group. |
22 |
|
|
23 |
|
3. Inside a character class, \B is treated as a literal by default, but |
24 |
|
faulted if PCRE_EXTRA is set. This mimics Perl's behaviour (the -w option |
25 |
|
causes the error). The code is unchanged, but I tidied the documentation. |
26 |
|
|
27 |
|
4. Inside a character class, PCRE always treated \R and \X as literals, |
28 |
|
whereas Perl faults them if its -w option is set. I have changed PCRE so |
29 |
|
that it faults them when PCRE_EXTRA is set. |
30 |
|
|
31 |
|
5. Added support for \N, which always matches any character other than |
32 |
|
newline. (It is the same as "." when PCRE_DOTALL is not set.) |
33 |
|
|
34 |
|
6. When compiling pcregrep with newer versions of gcc which may have |
35 |
|
FORTIFY_SOURCE set, several warnings "ignoring return value of 'fwrite', |
36 |
|
declared with attribute warn_unused_result" were given. Just casting the |
37 |
|
result to (void) does not stop the warnings; a more elaborate fudge is |
38 |
|
needed. I've used a macro to implement this. |
39 |
|
|
40 |
|
7. Minor change to pcretest.c to avoid a compiler warning. |
41 |
|
|
42 |
|
8. Added four artifical Unicode properties to help with an option to make |
43 |
|
\s etc use properties (see next item). The new properties are: Xan |
44 |
|
(alphanumeric), Xsp (Perl space), Xps (POSIX space), and Xwd (word). |
45 |
|
|
46 |
|
9. Added PCRE_UCP to make \b, \d, \s, \w, and certain POSIX character classes |
47 |
|
use Unicode properties. (*UCP) at the start of a pattern can be used to set |
48 |
|
this option. Modified pcretest to add /W to test this facility. Added |
49 |
|
REG_UCP to make it available via the POSIX interface. |
50 |
|
|
51 |
|
10. Added --line-buffered to pcregrep. |
52 |
|
|
53 |
|
11. In UTF-8 mode, if a pattern that was compiled with PCRE_CASELESS was |
54 |
|
studied, and the match started with a letter with a code point greater than |
55 |
|
127 whose first byte was different to the first byte of the other case of |
56 |
|
the letter, the other case of this starting letter was not recognized |
57 |
|
(#976). |
58 |
|
|
59 |
|
12. If a pattern that was studied started with a repeated Unicode property |
60 |
|
test, for example, \p{Nd}+, there was the theoretical possibility of |
61 |
|
setting up an incorrect bitmap of starting bytes, but fortunately it could |
62 |
|
not have actually happened in practice until change 8 above was made (it |
63 |
|
added property types that matched character-matching opcodes). |
64 |
|
|
65 |
|
13. pcre_study() now recognizes \h, \v, and \R when constructing a bit map of |
66 |
|
possible starting bytes for non-anchored patterns. |
67 |
|
|
68 |
|
14. Extended the "auto-possessify" feature of pcre_compile(). It now recognizes |
69 |
|
\R, and also a number of cases that involve Unicode properties, both |
70 |
|
explicit and implicit when PCRE_UCP is set. |
71 |
|
|
72 |
|
15. If a repeated Unicode property match (e.g. \p{Lu}*) was used with non-UTF-8 |
73 |
|
input, it could crash or give wrong results if characters with values |
74 |
|
greater than 0xc0 were present in the subject string. (Detail: it assumed |
75 |
|
UTF-8 input when processing these items.) |
76 |
|
|
77 |
|
16. Added a lot of (int) casts to avoid compiler warnings in systems where |
78 |
|
size_t is 64-bit (#991). |
79 |
|
|
80 |
|
17. Added a check for running out of memory when PCRE is compiled with |
81 |
|
--disable-stack-for-recursion (#990). |
82 |
|
|
83 |
|
18. If the last data line in a file for pcretest does not have a newline on |
84 |
|
the end, a newline was missing in the output. |
85 |
|
|
86 |
|
19. The default pcre_chartables.c file recognizes only ASCII characters (values |
87 |
|
less than 128) in its various bitmaps. However, there is a facility for |
88 |
|
generating tables according to the current locale when PCRE is compiled. It |
89 |
|
turns out that in some environments, 0x85 and 0xa0, which are Unicode space |
90 |
|
characters, are recognized by isspace() and therefore were getting set in |
91 |
|
these tables, and indeed these tables seem to approximate to ISO 8859. This |
92 |
|
caused a problem in UTF-8 mode when pcre_study() was used to create a list |
93 |
|
of bytes that can start a match. For \s, it was including 0x85 and 0xa0, |
94 |
|
which of course cannot start UTF-8 characters. I have changed the code so |
95 |
|
that only real ASCII characters (less than 128) and the correct starting |
96 |
|
bytes for UTF-8 encodings are set for characters greater than 127 when in |
97 |
|
UTF-8 mode. (When PCRE_UCP is set - see 9 above - the code is different |
98 |
|
altogether.) |
99 |
|
|
100 |
|
20. Added the /T option to pcretest so as to be able to run tests with non- |
101 |
|
standard character tables, thus making it possible to include the tests |
102 |
|
used for 19 above in the standard set of tests. |
103 |
|
|
104 |
|
21. A pattern such as (?&t)(?#()(?(DEFINE)(?<t>a)) which has a forward |
105 |
|
reference to a subpattern the other side of a comment that contains an |
106 |
|
opening parenthesis caused either an internal compiling error, or a |
107 |
|
reference to the wrong subpattern. |
108 |
|
|
109 |
|
|
110 |
|
Version 8.02 19-Mar-2010 |
111 |
|
------------------------ |
112 |
|
|
113 |
|
1. The Unicode data tables have been updated to Unicode 5.2.0. |
114 |
|
|
115 |
|
2. Added the option --libs-cpp to pcre-config, but only when C++ support is |
116 |
|
configured. |
117 |
|
|
118 |
|
3. Updated the licensing terms in the pcregexp.pas file, as agreed with the |
119 |
|
original author of that file, following a query about its status. |
120 |
|
|
121 |
|
4. On systems that do not have stdint.h (e.g. Solaris), check for and include |
122 |
|
inttypes.h instead. This fixes a bug that was introduced by change 8.01/8. |
123 |
|
|
124 |
|
5. A pattern such as (?&t)*+(?(DEFINE)(?<t>.)) which has a possessive |
125 |
|
quantifier applied to a forward-referencing subroutine call, could compile |
126 |
|
incorrect code or give the error "internal error: previously-checked |
127 |
|
referenced subpattern not found". |
128 |
|
|
129 |
|
6. Both MS Visual Studio and Symbian OS have problems with initializing |
130 |
|
variables to point to external functions. For these systems, therefore, |
131 |
|
pcre_malloc etc. are now initialized to local functions that call the |
132 |
|
relevant global functions. |
133 |
|
|
134 |
|
7. There were two entries missing in the vectors called coptable and poptable |
135 |
|
in pcre_dfa_exec.c. This could lead to memory accesses outsize the vectors. |
136 |
|
I've fixed the data, and added a kludgy way of testing at compile time that |
137 |
|
the lengths are correct (equal to the number of opcodes). |
138 |
|
|
139 |
|
8. Following on from 7, I added a similar kludge to check the length of the |
140 |
|
eint vector in pcreposix.c. |
141 |
|
|
142 |
|
9. Error texts for pcre_compile() are held as one long string to avoid too |
143 |
|
much relocation at load time. To find a text, the string is searched, |
144 |
|
counting zeros. There was no check for running off the end of the string, |
145 |
|
which could happen if a new error number was added without updating the |
146 |
|
string. |
147 |
|
|
148 |
|
10. \K gave a compile-time error if it appeared in a lookbehind assersion. |
149 |
|
|
150 |
|
11. \K was not working if it appeared in an atomic group or in a group that |
151 |
|
was called as a "subroutine", or in an assertion. Perl 5.11 documents that |
152 |
|
\K is "not well defined" if used in an assertion. PCRE now accepts it if |
153 |
|
the assertion is positive, but not if it is negative. |
154 |
|
|
155 |
|
12. Change 11 fortuitously reduced the size of the stack frame used in the |
156 |
|
"match()" function of pcre_exec.c by one pointer. Forthcoming |
157 |
|
implementation of support for (*MARK) will need an extra pointer on the |
158 |
|
stack; I have reserved it now, so that the stack frame size does not |
159 |
|
decrease. |
160 |
|
|
161 |
|
13. A pattern such as (?P<L1>(?P<L2>0)|(?P>L2)(?P>L1)) in which the only other |
162 |
|
item in branch that calls a recursion is a subroutine call - as in the |
163 |
|
second branch in the above example - was incorrectly given the compile- |
164 |
|
time error "recursive call could loop indefinitely" because pcre_compile() |
165 |
|
was not correctly checking the subroutine for matching a non-empty string. |
166 |
|
|
167 |
|
14. The checks for overrunning compiling workspace could trigger after an |
168 |
|
overrun had occurred. This is a "should never occur" error, but it can be |
169 |
|
triggered by pathological patterns such as hundreds of nested parentheses. |
170 |
|
The checks now trigger 100 bytes before the end of the workspace. |
171 |
|
|
172 |
|
15. Fix typo in configure.ac: "srtoq" should be "strtoq". |
173 |
|
|
174 |
|
|
175 |
|
Version 8.01 19-Jan-2010 |
176 |
|
------------------------ |
177 |
|
|
178 |
|
1. If a pattern contained a conditional subpattern with only one branch (in |
179 |
|
particular, this includes all (*DEFINE) patterns), a call to pcre_study() |
180 |
|
computed the wrong minimum data length (which is of course zero for such |
181 |
|
subpatterns). This could cause incorrect "no match" results. |
182 |
|
|
183 |
|
2. For patterns such as (?i)a(?-i)b|c where an option setting at the start of |
184 |
|
the pattern is reset in the first branch, pcre_compile() failed with |
185 |
|
"internal error: code overflow at offset...". This happened only when |
186 |
|
the reset was to the original external option setting. (An optimization |
187 |
|
abstracts leading options settings into an external setting, which was the |
188 |
|
cause of this.) |
189 |
|
|
190 |
|
3. A pattern such as ^(?!a(*SKIP)b) where a negative assertion contained one |
191 |
|
of the verbs SKIP, PRUNE, or COMMIT, did not work correctly. When the |
192 |
|
assertion pattern did not match (meaning that the assertion was true), it |
193 |
|
was incorrectly treated as false if the SKIP had been reached during the |
194 |
|
matching. This also applied to assertions used as conditions. |
195 |
|
|
196 |
|
4. If an item that is not supported by pcre_dfa_exec() was encountered in an |
197 |
|
assertion subpattern, including such a pattern used as a condition, |
198 |
|
unpredictable results occurred, instead of the error return |
199 |
|
PCRE_ERROR_DFA_UITEM. |
200 |
|
|
201 |
|
5. The C++ GlobalReplace function was not working like Perl for the special |
202 |
|
situation when an empty string is matched. It now does the fancy magic |
203 |
|
stuff that is necessary. |
204 |
|
|
205 |
|
6. In pcre_internal.h, obsolete includes to setjmp.h and stdarg.h have been |
206 |
|
removed. (These were left over from very, very early versions of PCRE.) |
207 |
|
|
208 |
|
7. Some cosmetic changes to the code to make life easier when compiling it |
209 |
|
as part of something else: |
210 |
|
|
211 |
|
(a) Change DEBUG to PCRE_DEBUG. |
212 |
|
|
213 |
|
(b) In pcre_compile(), rename the member of the "branch_chain" structure |
214 |
|
called "current" as "current_branch", to prevent a collision with the |
215 |
|
Linux macro when compiled as a kernel module. |
216 |
|
|
217 |
|
(c) In pcre_study(), rename the function set_bit() as set_table_bit(), to |
218 |
|
prevent a collision with the Linux macro when compiled as a kernel |
219 |
|
module. |
220 |
|
|
221 |
|
8. In pcre_compile() there are some checks for integer overflows that used to |
222 |
|
cast potentially large values to (double). This has been changed to that |
223 |
|
when building, a check for int64_t is made, and if it is found, it is used |
224 |
|
instead, thus avoiding the use of floating point arithmetic. (There is no |
225 |
|
other use of FP in PCRE.) If int64_t is not found, the fallback is to |
226 |
|
double. |
227 |
|
|
228 |
|
9. Added two casts to avoid signed/unsigned warnings from VS Studio Express |
229 |
|
2005 (difference between two addresses compared to an unsigned value). |
230 |
|
|
231 |
|
10. Change the standard AC_CHECK_LIB test for libbz2 in configure.ac to a |
232 |
|
custom one, because of the following reported problem in Windows: |
233 |
|
|
234 |
|
- libbz2 uses the Pascal calling convention (WINAPI) for the functions |
235 |
|
under Win32. |
236 |
|
- The standard autoconf AC_CHECK_LIB fails to include "bzlib.h", |
237 |
|
therefore missing the function definition. |
238 |
|
- The compiler thus generates a "C" signature for the test function. |
239 |
|
- The linker fails to find the "C" function. |
240 |
|
- PCRE fails to configure if asked to do so against libbz2. |
241 |
|
|
242 |
|
11. When running libtoolize from libtool-2.2.6b as part of autogen.sh, these |
243 |
|
messages were output: |
244 |
|
|
245 |
|
Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and |
246 |
|
rerunning libtoolize, to keep the correct libtool macros in-tree. |
247 |
|
Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. |
248 |
|
|
249 |
|
I have done both of these things. |
250 |
|
|
251 |
|
12. Although pcre_dfa_exec() does not use nearly as much stack as pcre_exec() |
252 |
|
most of the time, it *can* run out if it is given a pattern that contains a |
253 |
|
runaway infinite recursion. I updated the discussion in the pcrestack man |
254 |
|
page. |
255 |
|
|
256 |
|
13. Now that we have gone to the x.xx style of version numbers, the minor |
257 |
|
version may start with zero. Using 08 or 09 is a bad idea because users |
258 |
|
might check the value of PCRE_MINOR in their code, and 08 or 09 may be |
259 |
|
interpreted as invalid octal numbers. I've updated the previous comment in |
260 |
|
configure.ac, and also added a check that gives an error if 08 or 09 are |
261 |
|
used. |
262 |
|
|
263 |
|
14. Change 8.00/11 was not quite complete: code had been accidentally omitted, |
264 |
|
causing partial matching to fail when the end of the subject matched \W |
265 |
|
in a UTF-8 pattern where \W was quantified with a minimum of 3. |
266 |
|
|
267 |
|
15. There were some discrepancies between the declarations in pcre_internal.h |
268 |
|
of _pcre_is_newline(), _pcre_was_newline(), and _pcre_valid_utf8() and |
269 |
|
their definitions. The declarations used "const uschar *" and the |
270 |
|
definitions used USPTR. Even though USPTR is normally defined as "const |
271 |
|
unsigned char *" (and uschar is typedeffed as "unsigned char"), it was |
272 |
|
reported that: "This difference in casting confuses some C++ compilers, for |
273 |
|
example, SunCC recognizes above declarations as different functions and |
274 |
|
generates broken code for hbpcre." I have changed the declarations to use |
275 |
|
USPTR. |
276 |
|
|
277 |
|
16. GNU libtool is named differently on some systems. The autogen.sh script now |
278 |
|
tries several variants such as glibtoolize (MacOSX) and libtoolize1x |
279 |
|
(FreeBSD). |
280 |
|
|
281 |
|
17. Applied Craig's patch that fixes an HP aCC compile error in pcre 8.00 |
282 |
|
(strtoXX undefined when compiling pcrecpp.cc). The patch contains this |
283 |
|
comment: "Figure out how to create a longlong from a string: strtoll and |
284 |
|
equivalent. It's not enough to call AC_CHECK_FUNCS: hpux has a strtoll, for |
285 |
|
instance, but it only takes 2 args instead of 3!" |
286 |
|
|
287 |
|
18. A subtle bug concerned with back references has been fixed by a change of |
288 |
|
specification, with a corresponding code fix. A pattern such as |
289 |
|
^(xa|=?\1a)+$ which contains a back reference inside the group to which it |
290 |
|
refers, was giving matches when it shouldn't. For example, xa=xaaa would |
291 |
|
match that pattern. Interestingly, Perl (at least up to 5.11.3) has the |
292 |
|
same bug. Such groups have to be quantified to be useful, or contained |
293 |
|
inside another quantified group. (If there's no repetition, the reference |
294 |
|
can never match.) The problem arises because, having left the group and |
295 |
|
moved on to the rest of the pattern, a later failure that backtracks into |
296 |
|
the group uses the captured value from the final iteration of the group |
297 |
|
rather than the correct earlier one. I have fixed this in PCRE by forcing |
298 |
|
any group that contains a reference to itself to be an atomic group; that |
299 |
|
is, there cannot be any backtracking into it once it has completed. This is |
300 |
|
similar to recursive and subroutine calls. |
301 |
|
|
302 |
|
|
303 |
|
Version 8.00 19-Oct-09 |
304 |
|
---------------------- |
305 |
|
|
306 |
|
1. The table for translating pcre_compile() error codes into POSIX error codes |
307 |
|
was out-of-date, and there was no check on the pcre_compile() error code |
308 |
|
being within the table. This could lead to an OK return being given in |
309 |
|
error. |
310 |
|
|
311 |
|
2. Changed the call to open a subject file in pcregrep from fopen(pathname, |
312 |
|
"r") to fopen(pathname, "rb"), which fixed a problem with some of the tests |
313 |
|
in a Windows environment. |
314 |
|
|
315 |
|
3. The pcregrep --count option prints the count for each file even when it is |
316 |
|
zero, as does GNU grep. However, pcregrep was also printing all files when |
317 |
|
--files-with-matches was added. Now, when both options are given, it prints |
318 |
|
counts only for those files that have at least one match. (GNU grep just |
319 |
|
prints the file name in this circumstance, but including the count seems |
320 |
|
more useful - otherwise, why use --count?) Also ensured that the |
321 |
|
combination -clh just lists non-zero counts, with no names. |
322 |
|
|
323 |
|
4. The long form of the pcregrep -F option was incorrectly implemented as |
324 |
|
--fixed_strings instead of --fixed-strings. This is an incompatible change, |
325 |
|
but it seems right to fix it, and I didn't think it was worth preserving |
326 |
|
the old behaviour. |
327 |
|
|
328 |
|
5. The command line items --regex=pattern and --regexp=pattern were not |
329 |
|
recognized by pcregrep, which required --regex pattern or --regexp pattern |
330 |
|
(with a space rather than an '='). The man page documented the '=' forms, |
331 |
|
which are compatible with GNU grep; these now work. |
332 |
|
|
333 |
|
6. No libpcreposix.pc file was created for pkg-config; there was just |
334 |
|
libpcre.pc and libpcrecpp.pc. The omission has been rectified. |
335 |
|
|
336 |
|
7. Added #ifndef SUPPORT_UCP into the pcre_ucd.c module, to reduce its size |
337 |
|
when UCP support is not needed, by modifying the Python script that |
338 |
|
generates it from Unicode data files. This should not matter if the module |
339 |
|
is correctly used as a library, but I received one complaint about 50K of |
340 |
|
unwanted data. My guess is that the person linked everything into his |
341 |
|
program rather than using a library. Anyway, it does no harm. |
342 |
|
|
343 |
|
8. A pattern such as /\x{123}{2,2}+/8 was incorrectly compiled; the trigger |
344 |
|
was a minimum greater than 1 for a wide character in a possessive |
345 |
|
repetition. The same bug could also affect patterns like /(\x{ff}{0,2})*/8 |
346 |
|
which had an unlimited repeat of a nested, fixed maximum repeat of a wide |
347 |
|
character. Chaos in the form of incorrect output or a compiling loop could |
348 |
|
result. |
349 |
|
|
350 |
|
9. The restrictions on what a pattern can contain when partial matching is |
351 |
|
requested for pcre_exec() have been removed. All patterns can now be |
352 |
|
partially matched by this function. In addition, if there are at least two |
353 |
|
slots in the offset vector, the offset of the earliest inspected character |
354 |
|
for the match and the offset of the end of the subject are set in them when |
355 |
|
PCRE_ERROR_PARTIAL is returned. |
356 |
|
|
357 |
|
10. Partial matching has been split into two forms: PCRE_PARTIAL_SOFT, which is |
358 |
|
synonymous with PCRE_PARTIAL, for backwards compatibility, and |
359 |
|
PCRE_PARTIAL_HARD, which causes a partial match to supersede a full match, |
360 |
|
and may be more useful for multi-segment matching. |
361 |
|
|
362 |
|
11. Partial matching with pcre_exec() is now more intuitive. A partial match |
363 |
|
used to be given if ever the end of the subject was reached; now it is |
364 |
|
given only if matching could not proceed because another character was |
365 |
|
needed. This makes a difference in some odd cases such as Z(*FAIL) with the |
366 |
|
string "Z", which now yields "no match" instead of "partial match". In the |
367 |
|
case of pcre_dfa_exec(), "no match" is given if every matching path for the |
368 |
|
final character ended with (*FAIL). |
369 |
|
|
370 |
|
12. Restarting a match using pcre_dfa_exec() after a partial match did not work |
371 |
|
if the pattern had a "must contain" character that was already found in the |
372 |
|
earlier partial match, unless partial matching was again requested. For |
373 |
|
example, with the pattern /dog.(body)?/, the "must contain" character is |
374 |
|
"g". If the first part-match was for the string "dog", restarting with |
375 |
|
"sbody" failed. This bug has been fixed. |
376 |
|
|
377 |
|
13. The string returned by pcre_dfa_exec() after a partial match has been |
378 |
|
changed so that it starts at the first inspected character rather than the |
379 |
|
first character of the match. This makes a difference only if the pattern |
380 |
|
starts with a lookbehind assertion or \b or \B (\K is not supported by |
381 |
|
pcre_dfa_exec()). It's an incompatible change, but it makes the two |
382 |
|
matching functions compatible, and I think it's the right thing to do. |
383 |
|
|
384 |
|
14. Added a pcredemo man page, created automatically from the pcredemo.c file, |
385 |
|
so that the demonstration program is easily available in environments where |
386 |
|
PCRE has not been installed from source. |
387 |
|
|
388 |
|
15. Arranged to add -DPCRE_STATIC to cflags in libpcre.pc, libpcreposix.cp, |
389 |
|
libpcrecpp.pc and pcre-config when PCRE is not compiled as a shared |
390 |
|
library. |
391 |
|
|
392 |
|
16. Added REG_UNGREEDY to the pcreposix interface, at the request of a user. |
393 |
|
It maps to PCRE_UNGREEDY. It is not, of course, POSIX-compatible, but it |
394 |
|
is not the first non-POSIX option to be added. Clearly some people find |
395 |
|
these options useful. |
396 |
|
|
397 |
|
17. If a caller to the POSIX matching function regexec() passes a non-zero |
398 |
|
value for nmatch with a NULL value for pmatch, the value of |
399 |
|
nmatch is forced to zero. |
400 |
|
|
401 |
|
18. RunGrepTest did not have a test for the availability of the -u option of |
402 |
|
the diff command, as RunTest does. It now checks in the same way as |
403 |
|
RunTest, and also checks for the -b option. |
404 |
|
|
405 |
|
19. If an odd number of negated classes containing just a single character |
406 |
|
interposed, within parentheses, between a forward reference to a named |
407 |
|
subpattern and the definition of the subpattern, compilation crashed with |
408 |
|
an internal error, complaining that it could not find the referenced |
409 |
|
subpattern. An example of a crashing pattern is /(?&A)(([^m])(?<A>))/. |
410 |
|
[The bug was that it was starting one character too far in when skipping |
411 |
|
over the character class, thus treating the ] as data rather than |
412 |
|
terminating the class. This meant it could skip too much.] |
413 |
|
|
414 |
|
20. Added PCRE_NOTEMPTY_ATSTART in order to be able to correctly implement the |
415 |
|
/g option in pcretest when the pattern contains \K, which makes it possible |
416 |
|
to have an empty string match not at the start, even when the pattern is |
417 |
|
anchored. Updated pcretest and pcredemo to use this option. |
418 |
|
|
419 |
|
21. If the maximum number of capturing subpatterns in a recursion was greater |
420 |
|
than the maximum at the outer level, the higher number was returned, but |
421 |
|
with unset values at the outer level. The correct (outer level) value is |
422 |
|
now given. |
423 |
|
|
424 |
|
22. If (*ACCEPT) appeared inside capturing parentheses, previous releases of |
425 |
|
PCRE did not set those parentheses (unlike Perl). I have now found a way to |
426 |
|
make it do so. The string so far is captured, making this feature |
427 |
|
compatible with Perl. |
428 |
|
|
429 |
|
23. The tests have been re-organized, adding tests 11 and 12, to make it |
430 |
|
possible to check the Perl 5.10 features against Perl 5.10. |
431 |
|
|
432 |
|
24. Perl 5.10 allows subroutine calls in lookbehinds, as long as the subroutine |
433 |
|
pattern matches a fixed length string. PCRE did not allow this; now it |
434 |
|
does. Neither allows recursion. |
435 |
|
|
436 |
|
25. I finally figured out how to implement a request to provide the minimum |
437 |
|
length of subject string that was needed in order to match a given pattern. |
438 |
|
(It was back references and recursion that I had previously got hung up |
439 |
|
on.) This code has now been added to pcre_study(); it finds a lower bound |
440 |
|
to the length of subject needed. It is not necessarily the greatest lower |
441 |
|
bound, but using it to avoid searching strings that are too short does give |
442 |
|
some useful speed-ups. The value is available to calling programs via |
443 |
|
pcre_fullinfo(). |
444 |
|
|
445 |
|
26. While implementing 25, I discovered to my embarrassment that pcretest had |
446 |
|
not been passing the result of pcre_study() to pcre_dfa_exec(), so the |
447 |
|
study optimizations had never been tested with that matching function. |
448 |
|
Oops. What is worse, even when it was passed study data, there was a bug in |
449 |
|
pcre_dfa_exec() that meant it never actually used it. Double oops. There |
450 |
|
were also very few tests of studied patterns with pcre_dfa_exec(). |
451 |
|
|
452 |
|
27. If (?| is used to create subpatterns with duplicate numbers, they are now |
453 |
|
allowed to have the same name, even if PCRE_DUPNAMES is not set. However, |
454 |
|
on the other side of the coin, they are no longer allowed to have different |
455 |
|
names, because these cannot be distinguished in PCRE, and this has caused |
456 |
|
confusion. (This is a difference from Perl.) |
457 |
|
|
458 |
|
28. When duplicate subpattern names are present (necessarily with different |
459 |
|
numbers, as required by 27 above), and a test is made by name in a |
460 |
|
conditional pattern, either for a subpattern having been matched, or for |
461 |
|
recursion in such a pattern, all the associated numbered subpatterns are |
462 |
|
tested, and the overall condition is true if the condition is true for any |
463 |
|
one of them. This is the way Perl works, and is also more like the way |
464 |
|
testing by number works. |
465 |
|
|
466 |
|
|
467 |
|
Version 7.9 11-Apr-09 |
468 |
|
--------------------- |
469 |
|
|
470 |
|
1. When building with support for bzlib/zlib (pcregrep) and/or readline |
471 |
|
(pcretest), all targets were linked against these libraries. This included |
472 |
|
libpcre, libpcreposix, and libpcrecpp, even though they do not use these |
473 |
|
libraries. This caused unwanted dependencies to be created. This problem |
474 |
|
has been fixed, and now only pcregrep is linked with bzlib/zlib and only |
475 |
|
pcretest is linked with readline. |
476 |
|
|
477 |
|
2. The "typedef int BOOL" in pcre_internal.h that was included inside the |
478 |
|
"#ifndef FALSE" condition by an earlier change (probably 7.8/18) has been |
479 |
|
moved outside it again, because FALSE and TRUE are already defined in AIX, |
480 |
|
but BOOL is not. |
481 |
|
|
482 |
|
3. The pcre_config() function was treating the PCRE_MATCH_LIMIT and |
483 |
|
PCRE_MATCH_LIMIT_RECURSION values as ints, when they should be long ints. |
484 |
|
|
485 |
|
4. The pcregrep documentation said spaces were inserted as well as colons (or |
486 |
|
hyphens) following file names and line numbers when outputting matching |
487 |
|
lines. This is not true; no spaces are inserted. I have also clarified the |
488 |
|
wording for the --colour (or --color) option. |
489 |
|
|
490 |
|
5. In pcregrep, when --colour was used with -o, the list of matching strings |
491 |
|
was not coloured; this is different to GNU grep, so I have changed it to be |
492 |
|
the same. |
493 |
|
|
494 |
|
6. When --colo(u)r was used in pcregrep, only the first matching substring in |
495 |
|
each matching line was coloured. Now it goes on to look for further matches |
496 |
|
of any of the test patterns, which is the same behaviour as GNU grep. |
497 |
|
|
498 |
|
7. A pattern that could match an empty string could cause pcregrep to loop; it |
499 |
|
doesn't make sense to accept an empty string match in pcregrep, so I have |
500 |
|
locked it out (using PCRE's PCRE_NOTEMPTY option). By experiment, this |
501 |
|
seems to be how GNU grep behaves. |
502 |
|
|
503 |
|
8. The pattern (?(?=.*b)b|^) was incorrectly compiled as "match must be at |
504 |
|
start or after a newline", because the conditional assertion was not being |
505 |
|
correctly handled. The rule now is that both the assertion and what follows |
506 |
|
in the first alternative must satisfy the test. |
507 |
|
|
508 |
|
9. If auto-callout was enabled in a pattern with a conditional group whose |
509 |
|
condition was an assertion, PCRE could crash during matching, both with |
510 |
|
pcre_exec() and pcre_dfa_exec(). |
511 |
|
|
512 |
|
10. The PCRE_DOLLAR_ENDONLY option was not working when pcre_dfa_exec() was |
513 |
|
used for matching. |
514 |
|
|
515 |
|
11. Unicode property support in character classes was not working for |
516 |
|
characters (bytes) greater than 127 when not in UTF-8 mode. |
517 |
|
|
518 |
|
12. Added the -M command line option to pcretest. |
519 |
|
|
520 |
|
14. Added the non-standard REG_NOTEMPTY option to the POSIX interface. |
521 |
|
|
522 |
|
15. Added the PCRE_NO_START_OPTIMIZE match-time option. |
523 |
|
|
524 |
|
16. Added comments and documentation about mis-use of no_arg in the C++ |
525 |
|
wrapper. |
526 |
|
|
527 |
|
17. Implemented support for UTF-8 encoding in EBCDIC environments, a patch |
528 |
|
from Martin Jerabek that uses macro names for all relevant character and |
529 |
|
string constants. |
530 |
|
|
531 |
|
18. Added to pcre_internal.h two configuration checks: (a) If both EBCDIC and |
532 |
|
SUPPORT_UTF8 are set, give an error; (b) If SUPPORT_UCP is set without |
533 |
|
SUPPORT_UTF8, define SUPPORT_UTF8. The "configure" script handles both of |
534 |
|
these, but not everybody uses configure. |
535 |
|
|
536 |
|
19. A conditional group that had only one branch was not being correctly |
537 |
|
recognized as an item that could match an empty string. This meant that an |
538 |
|
enclosing group might also not be so recognized, causing infinite looping |
539 |
|
(and probably a segfault) for patterns such as ^"((?(?=[a])[^"])|b)*"$ |
540 |
|
with the subject "ab", where knowledge that the repeated group can match |
541 |
|
nothing is needed in order to break the loop. |
542 |
|
|
543 |
|
20. If a pattern that was compiled with callouts was matched using pcre_dfa_ |
544 |
|
exec(), but without supplying a callout function, matching went wrong. |
545 |
|
|
546 |
|
21. If PCRE_ERROR_MATCHLIMIT occurred during a recursion, there was a memory |
547 |
|
leak if the size of the offset vector was greater than 30. When the vector |
548 |
|
is smaller, the saved offsets during recursion go onto a local stack |
549 |
|
vector, but for larger vectors malloc() is used. It was failing to free |
550 |
|
when the recursion yielded PCRE_ERROR_MATCH_LIMIT (or any other "abnormal" |
551 |
|
error, in fact). |
552 |
|
|
553 |
|
22. There was a missing #ifdef SUPPORT_UTF8 round one of the variables in the |
554 |
|
heapframe that is used only when UTF-8 support is enabled. This caused no |
555 |
|
problem, but was untidy. |
556 |
|
|
557 |
|
23. Steven Van Ingelgem's patch to CMakeLists.txt to change the name |
558 |
|
CMAKE_BINARY_DIR to PROJECT_BINARY_DIR so that it works when PCRE is |
559 |
|
included within another project. |
560 |
|
|
561 |
|
24. Steven Van Ingelgem's patches to add more options to the CMake support, |
562 |
|
slightly modified by me: |
563 |
|
|
564 |
|
(a) PCRE_BUILD_TESTS can be set OFF not to build the tests, including |
565 |
|
not building pcregrep. |
566 |
|
|
567 |
|
(b) PCRE_BUILD_PCREGREP can be see OFF not to build pcregrep, but only |
568 |
|
if PCRE_BUILD_TESTS is also set OFF, because the tests use pcregrep. |
569 |
|
|
570 |
|
25. Forward references, both numeric and by name, in patterns that made use of |
571 |
|
duplicate group numbers, could behave incorrectly or give incorrect errors, |
572 |
|
because when scanning forward to find the reference group, PCRE was not |
573 |
|
taking into account the duplicate group numbers. A pattern such as |
574 |
|
^X(?3)(a)(?|(b)|(q))(Y) is an example. |
575 |
|
|
576 |
|
26. Changed a few more instances of "const unsigned char *" to USPTR, making |
577 |
|
the feature of a custom pointer more persuasive (as requested by a user). |
578 |
|
|
579 |
|
27. Wrapped the definitions of fileno and isatty for Windows, which appear in |
580 |
|
pcretest.c, inside #ifndefs, because it seems they are sometimes already |
581 |
|
pre-defined. |
582 |
|
|
583 |
|
28. Added support for (*UTF8) at the start of a pattern. |
584 |
|
|
585 |
|
29. Arrange for flags added by the "release type" setting in CMake to be shown |
586 |
|
in the configuration summary. |
587 |
|
|
588 |
|
|
589 |
|
Version 7.8 05-Sep-08 |
590 |
|
--------------------- |
591 |
|
|
592 |
|
1. Replaced UCP searching code with optimized version as implemented for Ad |
593 |
|
Muncher (http://www.admuncher.com/) by Peter Kankowski. This uses a two- |
594 |
|
stage table and inline lookup instead of a function, giving speed ups of 2 |
595 |
|
to 5 times on some simple patterns that I tested. Permission was given to |
596 |
|
distribute the MultiStage2.py script that generates the tables (it's not in |
597 |
|
the tarball, but is in the Subversion repository). |
598 |
|
|
599 |
|
2. Updated the Unicode datatables to Unicode 5.1.0. This adds yet more |
600 |
|
scripts. |
601 |
|
|
602 |
|
3. Change 12 for 7.7 introduced a bug in pcre_study() when a pattern contained |
603 |
|
a group with a zero qualifier. The result of the study could be incorrect, |
604 |
|
or the function might crash, depending on the pattern. |
605 |
|
|
606 |
|
4. Caseless matching was not working for non-ASCII characters in back |
607 |
|
references. For example, /(\x{de})\1/8i was not matching \x{de}\x{fe}. |
608 |
|
It now works when Unicode Property Support is available. |
609 |
|
|
610 |
|
5. In pcretest, an escape such as \x{de} in the data was always generating |
611 |
|
a UTF-8 string, even in non-UTF-8 mode. Now it generates a single byte in |
612 |
|
non-UTF-8 mode. If the value is greater than 255, it gives a warning about |
613 |
|
truncation. |
614 |
|
|
615 |
|
6. Minor bugfix in pcrecpp.cc (change "" == ... to NULL == ...). |
616 |
|
|
617 |
|
7. Added two (int) casts to pcregrep when printing the difference of two |
618 |
|
pointers, in case they are 64-bit values. |
619 |
|
|
620 |
|
8. Added comments about Mac OS X stack usage to the pcrestack man page and to |
621 |
|
test 2 if it fails. |
622 |
|
|
623 |
|
9. Added PCRE_CALL_CONVENTION just before the names of all exported functions, |
624 |
|
and a #define of that name to empty if it is not externally set. This is to |
625 |
|
allow users of MSVC to set it if necessary. |
626 |
|
|
627 |
|
10. The PCRE_EXP_DEFN macro which precedes exported functions was missing from |
628 |
|
the convenience functions in the pcre_get.c source file. |
629 |
|
|
630 |
|
11. An option change at the start of a pattern that had top-level alternatives |
631 |
|
could cause overwriting and/or a crash. This command provoked a crash in |
632 |
|
some environments: |
633 |
|
|
634 |
|
printf "/(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]/8\n" | pcretest |
635 |
|
|
636 |
|
This potential security problem was recorded as CVE-2008-2371. |
637 |
|
|
638 |
|
12. For a pattern where the match had to start at the beginning or immediately |
639 |
|
after a newline (e.g /.*anything/ without the DOTALL flag), pcre_exec() and |
640 |
|
pcre_dfa_exec() could read past the end of the passed subject if there was |
641 |
|
no match. To help with detecting such bugs (e.g. with valgrind), I modified |
642 |
|
pcretest so that it places the subject at the end of its malloc-ed buffer. |
643 |
|
|
644 |
|
13. The change to pcretest in 12 above threw up a couple more cases when pcre_ |
645 |
|
exec() might read past the end of the data buffer in UTF-8 mode. |
646 |
|
|
647 |
|
14. A similar bug to 7.3/2 existed when the PCRE_FIRSTLINE option was set and |
648 |
|
the data contained the byte 0x85 as part of a UTF-8 character within its |
649 |
|
first line. This applied both to normal and DFA matching. |
650 |
|
|
651 |
|
15. Lazy qualifiers were not working in some cases in UTF-8 mode. For example, |
652 |
|
/^[^d]*?$/8 failed to match "abc". |
653 |
|
|
654 |
|
16. Added a missing copyright notice to pcrecpp_internal.h. |
655 |
|
|
656 |
|
17. Make it more clear in the documentation that values returned from |
657 |
|
pcre_exec() in ovector are byte offsets, not character counts. |
658 |
|
|
659 |
|
18. Tidied a few places to stop certain compilers from issuing warnings. |
660 |
|
|
661 |
|
19. Updated the Virtual Pascal + BCC files to compile the latest v7.7, as |
662 |
|
supplied by Stefan Weber. I made a further small update for 7.8 because |
663 |
|
there is a change of source arrangements: the pcre_searchfuncs.c module is |
664 |
|
replaced by pcre_ucd.c. |
665 |
|
|
666 |
|
|
667 |
|
Version 7.7 07-May-08 |
668 |
--------------------- |
--------------------- |
669 |
|
|
670 |
1. Applied Craig's patch to sort out a long long problem: "If we can't convert |
1. Applied Craig's patch to sort out a long long problem: "If we can't convert |
671 |
a string to a long long, pretend we don't even have a long long." This is |
a string to a long long, pretend we don't even have a long long." This is |
672 |
done by checking for the strtoq, strtoll, and _strtoi64 functions. |
done by checking for the strtoq, strtoll, and _strtoi64 functions. |
673 |
|
|
674 |
2. Applied Craig's patch to pcrecpp.cc to restore ABI compatibility with |
2. Applied Craig's patch to pcrecpp.cc to restore ABI compatibility with |
675 |
pre-7.6 versions, which defined a global no_arg variable instead of putting |
pre-7.6 versions, which defined a global no_arg variable instead of putting |
676 |
it in the RE class. (See also #8 below.) |
it in the RE class. (See also #8 below.) |
677 |
|
|
678 |
3. Remove a line of dead code, identified by coverity and reported by Nuno |
3. Remove a line of dead code, identified by coverity and reported by Nuno |
679 |
Lopes. |
Lopes. |
680 |
|
|
681 |
4. Fixed two related pcregrep bugs involving -r with --include or --exclude: |
4. Fixed two related pcregrep bugs involving -r with --include or --exclude: |
682 |
|
|
683 |
(1) The include/exclude patterns were being applied to the whole pathnames |
(1) The include/exclude patterns were being applied to the whole pathnames |
684 |
of files, instead of just to the final components. |
of files, instead of just to the final components. |
685 |
|
|
686 |
(2) If there was more than one level of directory, the subdirectories were |
(2) If there was more than one level of directory, the subdirectories were |
687 |
skipped unless they satisfied the include/exclude conditions. This is |
skipped unless they satisfied the include/exclude conditions. This is |
688 |
inconsistent with GNU grep (and could even be seen as contrary to the |
inconsistent with GNU grep (and could even be seen as contrary to the |
689 |
pcregrep specification - which I improved to make it absolutely clear). |
pcregrep specification - which I improved to make it absolutely clear). |
690 |
The action now is always to scan all levels of directory, and just |
The action now is always to scan all levels of directory, and just |
691 |
apply the include/exclude patterns to regular files. |
apply the include/exclude patterns to regular files. |
692 |
|
|
693 |
5. Added the --include_dir and --exclude_dir patterns to pcregrep, and used |
5. Added the --include_dir and --exclude_dir patterns to pcregrep, and used |
694 |
--exclude_dir in the tests to avoid scanning .svn directories. |
--exclude_dir in the tests to avoid scanning .svn directories. |
695 |
|
|
696 |
6. Applied Craig's patch to the QuoteMeta function so that it escapes the |
6. Applied Craig's patch to the QuoteMeta function so that it escapes the |
697 |
NUL character as backslash + 0 rather than backslash + NUL, because PCRE |
NUL character as backslash + 0 rather than backslash + NUL, because PCRE |
698 |
doesn't support NULs in patterns. |
doesn't support NULs in patterns. |
699 |
|
|
700 |
7. Added some missing "const"s to declarations of static tables in |
7. Added some missing "const"s to declarations of static tables in |
701 |
pcre_compile.c and pcre_dfa_exec.c. |
pcre_compile.c and pcre_dfa_exec.c. |
702 |
|
|
703 |
8. Applied Craig's patch to pcrecpp.cc to fix a problem in OS X that was |
8. Applied Craig's patch to pcrecpp.cc to fix a problem in OS X that was |
704 |
caused by fix #2 above. (Subsequently also a second patch to fix the |
caused by fix #2 above. (Subsequently also a second patch to fix the |
705 |
first patch. And a third patch - this was a messy problem.) |
first patch. And a third patch - this was a messy problem.) |
706 |
|
|
707 |
9. Applied Craig's patch to remove the use of push_back(). |
9. Applied Craig's patch to remove the use of push_back(). |
708 |
|
|
709 |
10. Applied Alan Lehotsky's patch to add REG_STARTEND support to the POSIX |
10. Applied Alan Lehotsky's patch to add REG_STARTEND support to the POSIX |
710 |
matching function regexec(). |
matching function regexec(). |
711 |
|
|
712 |
11. Added support for the Oniguruma syntax \g<name>, \g<n>, \g'name', \g'n', |
11. Added support for the Oniguruma syntax \g<name>, \g<n>, \g'name', \g'n', |
713 |
which, however, unlike Perl's \g{...}, are subroutine calls, not back |
which, however, unlike Perl's \g{...}, are subroutine calls, not back |
714 |
references. PCRE supports relative numbers with this syntax (I don't think |
references. PCRE supports relative numbers with this syntax (I don't think |
715 |
Oniguruma does). |
Oniguruma does). |
716 |
|
|
717 |
12. Previously, a group with a zero repeat such as (...){0} was completely |
12. Previously, a group with a zero repeat such as (...){0} was completely |
718 |
omitted from the compiled regex. However, this means that if the group |
omitted from the compiled regex. However, this means that if the group |
719 |
was called as a subroutine from elsewhere in the pattern, things went wrong |
was called as a subroutine from elsewhere in the pattern, things went wrong |
720 |
(an internal error was given). Such groups are now left in the compiled |
(an internal error was given). Such groups are now left in the compiled |
721 |
pattern, with a new opcode that causes them to be skipped at execution |
pattern, with a new opcode that causes them to be skipped at execution |
722 |
time. |
time. |
723 |
|
|
724 |
13. Added the PCRE_JAVASCRIPT_COMPAT option. This currently does two things: |
13. Added the PCRE_JAVASCRIPT_COMPAT option. This makes the following changes |
725 |
|
to the way PCRE behaves: |
726 |
|
|
727 |
(a) A lone ] character is dis-allowed (Perl treats it as data). |
(a) A lone ] character is dis-allowed (Perl treats it as data). |
728 |
(b) A back reference to an unmatched subpattern matches an empty string |
|
729 |
|
(b) A back reference to an unmatched subpattern matches an empty string |
730 |
(Perl fails the current match path). |
(Perl fails the current match path). |
731 |
|
|
732 |
14. A pattern such as /(?2)[]a()b](abc)/ which had a forward reference to a |
(c) A data ] in a character class must be notated as \] because if the |
733 |
|
first data character in a class is ], it defines an empty class. (In |
734 |
|
Perl it is not possible to have an empty class.) The empty class [] |
735 |
|
never matches; it forces failure and is equivalent to (*FAIL) or (?!). |
736 |
|
The negative empty class [^] matches any one character, independently |
737 |
|
of the DOTALL setting. |
738 |
|
|
739 |
|
14. A pattern such as /(?2)[]a()b](abc)/ which had a forward reference to a |
740 |
non-existent subpattern following a character class starting with ']' and |
non-existent subpattern following a character class starting with ']' and |
741 |
containing () gave an internal compiling error instead of "reference to |
containing () gave an internal compiling error instead of "reference to |
742 |
non-existent subpattern". Fortunately, when the pattern did exist, the |
non-existent subpattern". Fortunately, when the pattern did exist, the |
743 |
compiled code was correct. (When scanning forwards to check for the |
compiled code was correct. (When scanning forwards to check for the |
744 |
existencd of the subpattern, it was treating the data ']' as terminating |
existencd of the subpattern, it was treating the data ']' as terminating |
745 |
the class, so got the count wrong. When actually compiling, the reference |
the class, so got the count wrong. When actually compiling, the reference |
746 |
was subsequently set up correctly.) |
was subsequently set up correctly.) |
747 |
|
|
748 |
|
15. The "always fail" assertion (?!) is optimzed to (*FAIL) by pcre_compile; |
749 |
|
it was being rejected as not supported by pcre_dfa_exec(), even though |
750 |
|
other assertions are supported. I have made pcre_dfa_exec() support |
751 |
|
(*FAIL). |
752 |
|
|
753 |
|
16. The implementation of 13c above involved the invention of a new opcode, |
754 |
|
OP_ALLANY, which is like OP_ANY but doesn't check the /s flag. Since /s |
755 |
|
cannot be changed at match time, I realized I could make a small |
756 |
|
improvement to matching performance by compiling OP_ALLANY instead of |
757 |
|
OP_ANY for "." when DOTALL was set, and then removing the runtime tests |
758 |
|
on the OP_ANY path. |
759 |
|
|
760 |
|
17. Compiling pcretest on Windows with readline support failed without the |
761 |
|
following two fixes: (1) Make the unistd.h include conditional on |
762 |
|
HAVE_UNISTD_H; (2) #define isatty and fileno as _isatty and _fileno. |
763 |
|
|
764 |
|
18. Changed CMakeLists.txt and cmake/FindReadline.cmake to arrange for the |
765 |
|
ncurses library to be included for pcretest when ReadLine support is |
766 |
|
requested, but also to allow for it to be overridden. This patch came from |
767 |
|
Daniel Bergström. |
768 |
|
|
769 |
|
19. There was a typo in the file ucpinternal.h where f0_rangeflag was defined |
770 |
|
as 0x00f00000 instead of 0x00800000. Luckily, this would not have caused |
771 |
|
any errors with the current Unicode tables. Thanks to Peter Kankowski for |
772 |
|
spotting this. |
773 |
|
|
774 |
|
|
775 |
Version 7.6 28-Jan-08 |
Version 7.6 28-Jan-08 |
776 |
--------------------- |
--------------------- |