summaryrefslogtreecommitdiff
path: root/ext/pcre/pcrelib/pcre_study.c
diff options
context:
space:
mode:
authorNuno Lopes <nlopess@php.net>2008-09-09 07:55:10 +0000
committerNuno Lopes <nlopess@php.net>2008-09-09 07:55:10 +0000
commitc778b3eb19e6c79a20968808f13bce03c2dfdf23 (patch)
tree0357e922d288ee5d1afee302d62f0ade231f864d /ext/pcre/pcrelib/pcre_study.c
parent6a2729ed4d09ba4c387db2aa67733c8ea448e7e6 (diff)
downloadphp-git-c778b3eb19e6c79a20968808f13bce03c2dfdf23.tar.gz
upgrade to PCRE 7.8. this includes a security improvement. I'll upgrade HEAD later (not urgent..)
Diffstat (limited to 'ext/pcre/pcrelib/pcre_study.c')
-rw-r--r--ext/pcre/pcrelib/pcre_study.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/pcre_study.c b/ext/pcre/pcrelib/pcre_study.c
index 25d5e1786e..226cc65941 100644
--- a/ext/pcre/pcrelib/pcre_study.c
+++ b/ext/pcre/pcrelib/pcre_study.c
@@ -218,6 +218,7 @@ do
/* SKIPZERO skips the bracket. */
case OP_SKIPZERO:
+ tcode++;
do tcode += GET(tcode,1); while (*tcode == OP_ALT);
tcode += 1 + LINK_SIZE;
break;
@@ -501,7 +502,7 @@ Returns: pointer to a pcre_extra block, with study_data filled in and the
NULL on error or if no optimization possible
*/
-PCRE_EXP_DEFN pcre_extra *
+PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION
pcre_study(const pcre *external_re, int options, const char **errorptr)
{
uschar start_bits[32];