author | April Chin <april.chin@oracle.com> |
Fri, 10 Jul 2015 08:56:04 -0700 | |
branch | s11u2-sru |
changeset 4620 | e3a4a6201724 |
permissions | -rw-r--r-- |
4620
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Patch from upstream: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
http://vcs.pcre.org/pcre?view=revision&revision=1558 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
to fix CVE-2015-3210 in this upstream bug: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
https://bugs.exim.org/show_bug.cgi?id=1636 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
Must also include the other commits to pcre_compile.c since 8.37; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
otherwise, a test case fails. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
http://vcs.pcre.org/pcre?view=revision&revision=1555 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
http://vcs.pcre.org/pcre?view=revision&revision=1556 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
http://vcs.pcre.org/pcre?view=revision&revision=1557 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
This patch may be removed when pcre is upgraded from version 8.37 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
--- pcre-8.37-orig/ChangeLog 2015-04-28 04:37:57.000000000 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+++ pcre-8.37/ChangeLog 2015-06-18 14:04:00.765607692 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
@@ -1,6 +1,29 @@ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
ChangeLog for PCRE |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
+Changes since Version 8.37 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
+------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
+1. If a group that contained a recursive back reference also contained a |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
+ forward reference subroutine call followed by a non-forward-reference |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
+ subroutine call, for example /.((?2)(?R)\1)()/, pcre2_compile() failed to |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
+ compile correct code, leading to undefined behaviour or an internally |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
+ detected error. This bug was discovered by the LLVM fuzzer. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
+2. Quantification of certain items (e.g. atomic back references) could cause |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
+ incorrect code to be compiled when recursive forward references were |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
+ involved. For example, in this pattern: /(?1)()((((((\1++))\x85)+)|))/. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
+ This bug was discovered by the LLVM fuzzer. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
34 |
+3. A repeated conditional group whose condition was a reference by name caused |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
35 |
+ a buffer overflow if there was more than one group with the given name. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
36 |
+ This bug was discovered by the LLVM fuzzer. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
37 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
38 |
+4. A recursive back reference by name within a group that had the same name as |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
39 |
+ another group caused a buffer overflow. For example: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
40 |
+ /(?J)(?'d'(?'d'\g{d}))/. This bug was discovered by the LLVM fuzzer. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
41 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
42 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
43 |
Version 8.37 28-April-2015 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
44 |
-------------------------- |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
45 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
46 |
--- pcre-8.37-orig/pcre_compile.c 2015-04-13 08:54:01.000000000 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
47 |
+++ pcre-8.37/pcre_compile.c 2015-06-18 13:50:47.045221926 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
48 |
@@ -3985,11 +3985,12 @@ have their offsets adjusted. That one of |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
49 |
is called, the partially compiled regex must be temporarily terminated with |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
50 |
OP_END. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
51 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
52 |
-This function has been extended with the possibility of forward references for |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
53 |
-recursions and subroutine calls. It must also check the list of such references |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
54 |
-for the group we are dealing with. If it finds that one of the recursions in |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
55 |
-the current group is on this list, it adjusts the offset in the list, not the |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
56 |
-value in the reference (which is a group number). |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
57 |
+This function has been extended to cope with forward references for recursions |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
58 |
+and subroutine calls. It must check the list of such references for the |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
59 |
+group we are dealing with. If it finds that one of the recursions in the |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
60 |
+current group is on this list, it does not adjust the value in the reference |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
61 |
+(which is a group number). After the group has been scanned, all the offsets in |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
62 |
+the forward reference list for the group are adjusted. |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
63 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
64 |
Arguments: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
65 |
group points to the start of the group |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
66 |
@@ -4005,29 +4006,21 @@ static void |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
67 |
adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd, |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
68 |
size_t save_hwm_offset) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
69 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
70 |
+int offset; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
71 |
+pcre_uchar *hc; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
72 |
pcre_uchar *ptr = group; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
73 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
74 |
while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
75 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
76 |
- int offset; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
77 |
- pcre_uchar *hc; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
78 |
- |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
79 |
- /* See if this recursion is on the forward reference list. If so, adjust the |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
80 |
- reference. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
81 |
- |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
82 |
for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
83 |
hc += LINK_SIZE) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
84 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
85 |
offset = (int)GET(hc, 0); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
86 |
- if (cd->start_code + offset == ptr + 1) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
87 |
- { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
88 |
- PUT(hc, 0, offset + adjust); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
89 |
- break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
90 |
- } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
91 |
+ if (cd->start_code + offset == ptr + 1) break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
92 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
93 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
94 |
- /* Otherwise, adjust the recursion offset if it's after the start of this |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
95 |
- group. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
96 |
+ /* If we have not found this recursion on the forward reference list, adjust |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
97 |
+ the recursion's offset if it's after the start of this group. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
98 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
99 |
if (hc >= cd->hwm) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
100 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
101 |
@@ -4037,6 +4030,15 @@ while ((ptr = (pcre_uchar *)find_recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
102 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
103 |
ptr += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
104 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
105 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
106 |
+/* Now adjust all forward reference offsets for the group. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
107 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
108 |
+for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
109 |
+ hc += LINK_SIZE) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
110 |
+ { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
111 |
+ offset = (int)GET(hc, 0); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
112 |
+ PUT(hc, 0, offset + adjust); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
113 |
+ } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
114 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
115 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
116 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
117 |
@@ -4465,7 +4467,7 @@ const pcre_uchar *tempptr; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
118 |
const pcre_uchar *nestptr = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
119 |
pcre_uchar *previous = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
120 |
pcre_uchar *previous_callout = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
121 |
-size_t save_hwm_offset = 0; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
122 |
+size_t item_hwm_offset = 0; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
123 |
pcre_uint8 classbits[32]; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
124 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
125 |
/* We can fish out the UTF-8 setting once and for all into a BOOL, but we |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
126 |
@@ -4767,6 +4769,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
127 |
zeroreqchar = reqchar; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
128 |
zeroreqcharflags = reqcharflags; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
129 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
130 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
131 |
*code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
132 |
break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
133 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
134 |
@@ -4818,6 +4821,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
135 |
/* Handle a real character class. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
136 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
137 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
138 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
139 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
140 |
/* PCRE supports POSIX class stuff inside a class. Perl gives an error if |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
141 |
they are encountered at the top level, so we'll do that too. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
142 |
@@ -5930,7 +5934,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
143 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
144 |
register int i; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
145 |
int len = (int)(code - previous); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
146 |
- size_t base_hwm_offset = save_hwm_offset; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
147 |
+ size_t base_hwm_offset = item_hwm_offset; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
148 |
pcre_uchar *bralink = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
149 |
pcre_uchar *brazeroptr = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
150 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
151 |
@@ -5985,7 +5989,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
152 |
if (repeat_max <= 1) /* Covers 0, 1, and unlimited */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
153 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
154 |
*code = OP_END; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
155 |
- adjust_recurse(previous, 1, utf, cd, save_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
156 |
+ adjust_recurse(previous, 1, utf, cd, item_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
157 |
memmove(previous + 1, previous, IN_UCHARS(len)); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
158 |
code++; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
159 |
if (repeat_max == 0) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
160 |
@@ -6009,7 +6013,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
161 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
162 |
int offset; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
163 |
*code = OP_END; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
164 |
- adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
165 |
+ adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
166 |
memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len)); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
167 |
code += 2 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
168 |
*previous++ = OP_BRAZERO + repeat_type; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
169 |
@@ -6267,7 +6271,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
170 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
171 |
int nlen = (int)(code - bracode); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
172 |
*code = OP_END; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
173 |
- adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
174 |
+ adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
175 |
memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen)); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
176 |
code += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
177 |
nlen += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
178 |
@@ -6401,7 +6405,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
179 |
else |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
180 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
181 |
*code = OP_END; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
182 |
- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
183 |
+ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
184 |
memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
185 |
code += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
186 |
len += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
187 |
@@ -6450,7 +6454,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
188 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
189 |
default: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
190 |
*code = OP_END; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
191 |
- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
192 |
+ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
193 |
memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
194 |
code += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
195 |
len += 1 + LINK_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
196 |
@@ -6623,7 +6627,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
197 |
newoptions = options; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
198 |
skipbytes = 0; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
199 |
bravalue = OP_CBRA; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
200 |
- save_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
201 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
202 |
reset_bracount = FALSE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
203 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
204 |
/* Deal with the extended parentheses; all are introduced by '?', and the |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
205 |
@@ -6769,7 +6773,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
206 |
ptr++; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
207 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
208 |
namelen = (int)(ptr - name); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
209 |
- if (lengthptr != NULL) *lengthptr += IMM2_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
210 |
+ if (lengthptr != NULL) skipbytes += IMM2_SIZE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
211 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
212 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
213 |
/* Check the terminator */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
214 |
@@ -7173,14 +7177,26 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
215 |
number. If the name is not found, set the value to 0 for a forward |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
216 |
reference. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
217 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
218 |
+ recno = 0; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
219 |
ng = cd->named_groups; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
220 |
for (i = 0; i < cd->names_found; i++, ng++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
221 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
222 |
if (namelen == ng->length && |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
223 |
STRNCMP_UC_UC(name, ng->name, namelen) == 0) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
224 |
- break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
225 |
+ { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
226 |
+ open_capitem *oc; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
227 |
+ recno = ng->number; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
228 |
+ if (is_recurse) break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
229 |
+ for (oc = cd->open_caps; oc != NULL; oc = oc->next) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
230 |
+ { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
231 |
+ if (oc->number == recno) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
232 |
+ { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
233 |
+ oc->flag = TRUE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
234 |
+ break; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
235 |
+ } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
236 |
+ } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
237 |
+ } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
238 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
239 |
- recno = (i < cd->names_found)? ng->number : 0; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
240 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
241 |
/* Count named back references. */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
242 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
243 |
@@ -7247,6 +7263,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
244 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
245 |
if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
246 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
247 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
248 |
*code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
249 |
PUT2INC(code, 0, index); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
250 |
PUT2INC(code, 0, count); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
251 |
@@ -7360,6 +7377,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
252 |
HANDLE_RECURSION: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
253 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
254 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
255 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
256 |
called = cd->start_code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
257 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
258 |
/* When we are actually compiling, find the bracket that is being |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
259 |
@@ -7561,7 +7579,11 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
260 |
previous = NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
261 |
cd->iscondassert = FALSE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
262 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
263 |
- else previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
264 |
+ else |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
265 |
+ { |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
266 |
+ previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
267 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
268 |
+ } |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
269 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
270 |
*code = bravalue; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
271 |
tempcode = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
272 |
@@ -7809,7 +7831,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
273 |
const pcre_uchar *p; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
274 |
pcre_uint32 cf; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
275 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
276 |
- save_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
277 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
278 |
terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)? |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
279 |
CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
280 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
281 |
@@ -7877,6 +7899,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
282 |
HANDLE_REFERENCE: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
283 |
if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
284 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
285 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
286 |
*code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
287 |
PUT2INC(code, 0, recno); |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
288 |
cd->backref_map |= (recno < 32)? (1 << recno) : 1; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
289 |
@@ -7906,6 +7929,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
290 |
if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr)) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
291 |
goto FAILED; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
292 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
293 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
294 |
*code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
295 |
*code++ = ptype; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
296 |
*code++ = pdata; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
297 |
@@ -7946,6 +7970,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
298 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
299 |
{ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
300 |
previous = (escape > ESC_b && escape < ESC_Z)? code : NULL; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
301 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
302 |
*code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
303 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
304 |
} |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
305 |
@@ -7989,6 +8014,7 @@ for (;; ptr++) |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
306 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
307 |
ONE_CHAR: |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
308 |
previous = code; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
309 |
+ item_hwm_offset = cd->hwm - cd->start_workspace; |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
310 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
311 |
/* For caseless UTF-8 mode when UCP support is available, check whether |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
312 |
this character has more than one other case. If so, generate a special |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
313 |
--- pcre-8.37-orig/testdata/testinput11 2015-03-02 09:08:42.000000000 -0800 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
314 |
+++ pcre-8.37/testdata/testinput11 2015-06-18 14:07:11.883240591 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
315 |
@@ -136,4 +136,6 @@ is required for these tests. --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
316 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
317 |
/((?+1)(\1))/B |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
318 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
319 |
+/.((?2)(?R)\1)()/B |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
320 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
321 |
/-- End of testinput11 --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
322 |
--- pcre-8.37-orig/testdata/testinput2 2015-04-13 02:36:15.000000000 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
323 |
+++ pcre-8.37/testdata/testinput2 2015-06-18 14:13:30.706283638 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
324 |
@@ -4152,4 +4152,20 @@ backtracking verbs. --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
325 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
326 |
/((?2){73}(?2))((?1))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
327 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
328 |
+/.((?2)(?R)\1)()/BZ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
329 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
330 |
+/(?1)()((((((\1++))\x85)+)|))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
331 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
332 |
+/(\9*+(?2);\3++()2|)++{/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
333 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
334 |
+/\V\x85\9*+((?2)\3++()2)*:2/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
335 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
336 |
+/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
337 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
338 |
+/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
339 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
340 |
+/(((?(R)){0,2}) (?''((?'X')((?'R')))))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
341 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
342 |
+"(?J)(?'d'(?'d'\g{d}))" |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
343 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
344 |
/-- End of testinput2 --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
345 |
--- pcre-8.37-orig/testdata/testoutput11-16 2015-03-02 09:09:21.000000000 -0800 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
346 |
+++ pcre-8.37/testdata/testoutput11-16 2015-06-18 14:09:10.358550764 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
347 |
@@ -748,4 +748,21 @@ Memory allocation (code space): 14 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
348 |
22 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
349 |
------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
350 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
351 |
+/.((?2)(?R)\1)()/B |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
352 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
353 |
+ 0 23 Bra |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
354 |
+ 2 Any |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
355 |
+ 3 13 Once |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
356 |
+ 5 9 CBra 1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
357 |
+ 8 18 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
358 |
+ 10 0 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
359 |
+ 12 \1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
360 |
+ 14 9 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
361 |
+ 16 13 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
362 |
+ 18 3 CBra 2 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
363 |
+ 21 3 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
364 |
+ 23 23 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
365 |
+ 25 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
366 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
367 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
368 |
/-- End of testinput11 --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
369 |
--- pcre-8.37-orig/testdata/testoutput11-32 2015-03-02 09:09:30.000000000 -0800 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
370 |
+++ pcre-8.37/testdata/testoutput11-32 2015-06-18 14:10:09.893600910 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
371 |
@@ -748,4 +748,21 @@ Memory allocation (code space): 28 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
372 |
22 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
373 |
------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
374 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
375 |
+/.((?2)(?R)\1)()/B |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
376 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
377 |
+ 0 23 Bra |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
378 |
+ 2 Any |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
379 |
+ 3 13 Once |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
380 |
+ 5 9 CBra 1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
381 |
+ 8 18 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
382 |
+ 10 0 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
383 |
+ 12 \1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
384 |
+ 14 9 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
385 |
+ 16 13 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
386 |
+ 18 3 CBra 2 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
387 |
+ 21 3 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
388 |
+ 23 23 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
389 |
+ 25 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
390 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
391 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
392 |
/-- End of testinput11 --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
393 |
--- pcre-8.37-orig/testdata/testoutput11-8 2015-03-02 09:09:13.000000000 -0800 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
394 |
+++ pcre-8.37/testdata/testoutput11-8 2015-06-18 14:11:19.765400848 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
395 |
@@ -748,4 +748,21 @@ Memory allocation (code space): 10 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
396 |
34 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
397 |
------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
398 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
399 |
+/.((?2)(?R)\1)()/B |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
400 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
401 |
+ 0 35 Bra |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
402 |
+ 3 Any |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
403 |
+ 4 20 Once |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
404 |
+ 7 14 CBra 1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
405 |
+ 12 27 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
406 |
+ 15 0 Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
407 |
+ 18 \1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
408 |
+ 21 14 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
409 |
+ 24 20 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
410 |
+ 27 5 CBra 2 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
411 |
+ 32 5 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
412 |
+ 35 35 Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
413 |
+ 38 End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
414 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
415 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
416 |
/-- End of testinput11 --/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
417 |
--- pcre-8.37-orig/testdata/testoutput2 2015-04-13 02:36:27.000000000 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
418 |
+++ pcre-8.37/testdata/testoutput2 2015-06-18 14:15:05.747984099 -0700 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
419 |
@@ -14423,4 +14423,37 @@ Failed: lookbehind assertion is not fixe |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
420 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
421 |
/((?2){73}(?2))((?1))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
422 |
|
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
423 |
+/.((?2)(?R)\1)()/BZ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
424 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
425 |
+ Bra |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
426 |
+ Any |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
427 |
+ Once |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
428 |
+ CBra 1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
429 |
+ Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
430 |
+ Recurse |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
431 |
+ \1 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
432 |
+ Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
433 |
+ Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
434 |
+ CBra 2 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
435 |
+ Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
436 |
+ Ket |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
437 |
+ End |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
438 |
+------------------------------------------------------------------ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
439 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
440 |
+/(?1)()((((((\1++))\x85)+)|))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
441 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
442 |
+/(\9*+(?2);\3++()2|)++{/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
443 |
+Failed: reference to non-existent subpattern at offset 22 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
444 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
445 |
+/\V\x85\9*+((?2)\3++()2)*:2/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
446 |
+Failed: reference to non-existent subpattern at offset 26 |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
447 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
448 |
+/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
449 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
450 |
+/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
451 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
452 |
+/(((?(R)){0,2}) (?''((?'X')((?'R')))))/ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
453 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
454 |
+"(?J)(?'d'(?'d'\g{d}))" |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
455 |
+ |
e3a4a6201724
21290075 update pcre to version 8.37
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
456 |
/-- End of testinput2 --/ |