git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated embedded PCRE to version 7.4 to avoid 2 CVE issues:-
[exim.git]
/
src
/
src
/
pcre
/
pcre_study.c
diff --git
a/src/src/pcre/pcre_study.c
b/src/src/pcre/pcre_study.c
index 8858f7f40fa3d693cf2eb9d07d93be2353eacd6f..6848a196785105ccc675c0bd4b8d02db16d3865e 100644
(file)
--- a/
src/src/pcre/pcre_study.c
+++ b/
src/src/pcre/pcre_study.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/pcre/pcre_study.c,v 1.
5 2007/06/26 11:16:54 ph10
Exp $ */
+/* $Cambridge: exim/src/src/pcre/pcre_study.c,v 1.
6 2007/11/12 13:02:20 nm4
Exp $ */
/*************************************************
* Perl-Compatible Regular Expressions *
/*************************************************
* Perl-Compatible Regular Expressions *
@@
-44,6
+44,10
@@
POSSIBILITY OF SUCH DAMAGE.
supporting functions. */
supporting functions. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "pcre_internal.h"
#include "pcre_internal.h"
@@
-525,7
+529,8
@@
code = (uschar *)re + re->name_table_offset +
a multiline pattern that matches only at "line starts", no further processing
at present. */
a multiline pattern that matches only at "line starts", no further processing
at present. */
-if ((re->options & (PCRE_ANCHORED|PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
+if ((re->options & PCRE_ANCHORED) != 0 ||
+ (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
return NULL;
/* Set the character tables in the block that is passed around */
return NULL;
/* Set the character tables in the block that is passed around */