Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/pcre/patches/pcre_compile.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 744 6df1d115f82e
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
upstream/oracle/userland-gate