| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 26 Nov 2013 13:57:44 -0800 | |
| branch | s11u1-sru |
| changeset 2833 | 7c462f1b96b8 |
| parent 744 | 6df1d115f82e |
| permissions | -rw-r--r-- |
|
744
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
diff -ru pcre-8.21.orig//pcre_compile.c pcre-8.21/pcre_compile.c |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
--- pcre-8.21.orig//pcre_compile.c Wed Dec 7 08:45:36 2011 |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
+++ pcre-8.21/pcre_compile.c Mon Mar 19 15:11:42 2012 |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
@@ -1655,7 +1655,8 @@ |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
case OP_ASSERTBACK: |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
case OP_ASSERTBACK_NOT: |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
do cc += GET(cc, 1); while (*cc == OP_ALT); |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
- /* Fall through */ |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
+ cc += _pcre_OP_lengths[*cc]; |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
+ break; |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
|
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
/* Skip over things that don't match chars */ |
|
6df1d115f82e
7155807 pcre v8.21 has a bug in fixed-length calculation for lookbehinds
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |