summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2016-02-28 14:56:33 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2016-02-28 14:56:33 +0000
commitf9cc3952c363234ecb472dbea82661ba733f8bd1 (patch)
tree5813f08172e08bd1ccd28b41e2e0ce8e21b04e90
parentb3db1b7de5cfaa026ec2bc4a393129461a0f5c57 (diff)
downloadpcre-f9cc3952c363234ecb472dbea82661ba733f8bd1.tar.gz
Fix typo in pcre_study().
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1639 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog3
-rw-r--r--pcre_study.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 47555c0..f978020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,9 @@ Version 8.39 xx-xxxxxx-201x
("assertion expected") when (?(?C) was not followed by an opening
parenthesis.
+17. Fixed typo ("&&" for "&") in pcre_study(). Fortunately, this could not
+ actually affect anything, by sheer luck.
+
Version 8.38 23-November-2015
-----------------------------
diff --git a/pcre_study.c b/pcre_study.c
index 7fd0ba0..d9d4960 100644
--- a/pcre_study.c
+++ b/pcre_study.c
@@ -1371,7 +1371,7 @@ do
for (c = 0; c < 16; c++) start_bits[c] |= map[c];
for (c = 128; c < 256; c++)
{
- if ((map[c/8] && (1 << (c&7))) != 0)
+ if ((map[c/8] & (1 << (c&7))) != 0)
{
int d = (c >> 6) | 0xc0; /* Set bit for this starter */
start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */