summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2015-11-17 17:53:37 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2015-11-17 17:53:37 +0000
commit9660a9ee23143928ed55e00a8081f93c67613305 (patch)
treed3854247c921ae8b4b7c9b2a402079f6ba0814e6
parent2570aa3a71035885c4c21b829d847a788b49f92c (diff)
downloadpcre-9660a9ee23143928ed55e00a8081f93c67613305.tar.gz
Fix [:punct:] bug in UCP mode (interpreter only).
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1605 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--pcre_xclass.c2
-rw-r--r--testdata/testinput64
-rw-r--r--testdata/testoutput66
3 files changed, 11 insertions, 1 deletions
diff --git a/pcre_xclass.c b/pcre_xclass.c
index c2b61f0..ef759a5 100644
--- a/pcre_xclass.c
+++ b/pcre_xclass.c
@@ -246,7 +246,7 @@ while ((t = *data++) != XCL_END)
case PT_PXPUNCT:
if ((PRIV(ucp_gentype)[prop->chartype] == ucp_P ||
- (c < 256 && PRIV(ucp_gentype)[prop->chartype] == ucp_S)) == isprop)
+ (c < 128 && PRIV(ucp_gentype)[prop->chartype] == ucp_S)) == isprop)
return !negated;
break;
diff --git a/testdata/testinput6 b/testdata/testinput6
index 5666fbc..8aee0d0 100644
--- a/testdata/testinput6
+++ b/testdata/testinput6
@@ -1505,4 +1505,8 @@
/[\pS#moq]/
=
+/[[:punct:]]/8W
+ \xc2\xb4
+ \x{b4}
+
/-- End of testinput6 --/
diff --git a/testdata/testoutput6 b/testdata/testoutput6
index 72e4f46..196f993 100644
--- a/testdata/testoutput6
+++ b/testdata/testoutput6
@@ -2473,4 +2473,10 @@ No match
=
0: =
+/[[:punct:]]/8W
+ \xc2\xb4
+No match
+ \x{b4}
+No match
+
/-- End of testinput6 --/