summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2015-12-04 14:34:35 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2015-12-04 14:34:35 +0000
commitf62077471976971c426d0ae906c7c1136686d47c (patch)
treebf0a189304f7cc682559c71e230351fc8a420fd9
parent9594cf6047106cd0f1459c9318877e14e6d4ff13 (diff)
downloadpcre2-f62077471976971c426d0ae906c7c1136686d47c.tar.gz
Fix typo introduced by ChangeLog 107.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@460 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--src/pcre2_compile.c18
-rw-r--r--testdata/testinput52
-rw-r--r--testdata/testoutput53
3 files changed, 14 insertions, 9 deletions
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index 3a76401..632f64a 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -5058,26 +5058,26 @@ for (;; ptr++)
if ((options & PCRE2_EXTENDED) != 0)
{
- PCRE2_SPTR p = ptr + 1;
+ ptr++;
for (;;)
{
- while (MAX_255(*p) && (cb->ctypes[*p] & ctype_space) != 0) p++;
- if (*p != CHAR_NUMBER_SIGN) break;
- p++;
+ while (MAX_255(*ptr) && (cb->ctypes[*ptr] & ctype_space) != 0) ptr++;
+ if (*ptr != CHAR_NUMBER_SIGN) break;
+ ptr++;
while (ptr < cb->end_pattern)
{
- if (IS_NEWLINE(p)) /* For non-fixed-length newline cases, */
+ if (IS_NEWLINE(ptr)) /* For non-fixed-length newline cases, */
{ /* IS_NEWLINE sets cb->nllen. */
- p += cb->nllen;
+ ptr += cb->nllen;
break;
}
- p++;
+ ptr++;
#ifdef SUPPORT_UNICODE
- if (utf) FORWARDCHAR(p);
+ if (utf) FORWARDCHAR(ptr);
#endif
} /* Loop for comment characters */
} /* Loop for multiple comments */
- ptr = p - 1; /* Character before the next significant one. */
+ ptr--; /* Last code unit of previous character. */
}
/* If the next character is '+', we have a possessive quantifier. This
diff --git a/testdata/testinput5 b/testdata/testinput5
index a9a1d7c..eeb0bff 100644
--- a/testdata/testinput5
+++ b/testdata/testinput5
@@ -1716,4 +1716,6 @@
/L(?#(|++<!(2)?/B,utf,ucp,auto_callout
+/(*UTF)C\x09((?<!'(?x)!*H? #\xcc\x9a[^$]/
+
# End of testinput5
diff --git a/testdata/testoutput5 b/testdata/testoutput5
index 9ca7562..80da58e 100644
--- a/testdata/testoutput5
+++ b/testdata/testoutput5
@@ -4166,4 +4166,7 @@ No match
End
------------------------------------------------------------------
+/(*UTF)C\x09((?<!'(?x)!*H? #\xcc\x9a[^$]/
+Failed: error 114 at offset 39: missing closing parenthesis
+
# End of testinput5