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_fullinfo.c
diff --git
a/src/src/pcre/pcre_fullinfo.c
b/src/src/pcre/pcre_fullinfo.c
index c17f3d72bda3650d185a9f7668be037d1db48934..797241dd58090acb071fd2c7e2efd06bfdf107df 100644
(file)
--- a/
src/src/pcre/pcre_fullinfo.c
+++ b/
src/src/pcre/pcre_fullinfo.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/pcre/pcre_fullinfo.c,v 1.
5 2007/06/26 11:16:54 ph10
Exp $ */
+/* $Cambridge: exim/src/src/pcre/pcre_fullinfo.c,v 1.
6 2007/11/12 13:02:19 nm4
Exp $ */
/*************************************************
* Perl-Compatible Regular Expressions *
/*************************************************
* Perl-Compatible Regular Expressions *
@@
-44,6
+44,10
@@
POSSIBILITY OF SUCH DAMAGE.
information about a compiled pattern. */
information about a compiled pattern. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "pcre_internal.h"
#include "pcre_internal.h"
@@
-108,8
+112,8
@@
switch (what)
case PCRE_INFO_FIRSTBYTE:
*((int *)where) =
case PCRE_INFO_FIRSTBYTE:
*((int *)where) =
- ((re->
option
s & PCRE_FIRSTSET) != 0)? re->first_byte :
- ((re->
option
s & PCRE_STARTLINE) != 0)? -1 : -2;
+ ((re->
flag
s & PCRE_FIRSTSET) != 0)? re->first_byte :
+ ((re->
flag
s & PCRE_STARTLINE) != 0)? -1 : -2;
break;
/* Make sure we pass back the pointer to the bit vector in the external
break;
/* Make sure we pass back the pointer to the bit vector in the external
@@
-123,7
+127,7
@@
switch (what)
case PCRE_INFO_LASTLITERAL:
*((int *)where) =
case PCRE_INFO_LASTLITERAL:
*((int *)where) =
- ((re->
option
s & PCRE_REQCHSET) != 0)? re->req_byte : -1;
+ ((re->
flag
s & PCRE_REQCHSET) != 0)? re->req_byte : -1;
break;
case PCRE_INFO_NAMEENTRYSIZE:
break;
case PCRE_INFO_NAMEENTRYSIZE:
@@
-143,11
+147,15
@@
switch (what)
break;
case PCRE_INFO_OKPARTIAL:
break;
case PCRE_INFO_OKPARTIAL:
- *((int *)where) = (re->
option
s & PCRE_NOPARTIAL) == 0;
+ *((int *)where) = (re->
flag
s & PCRE_NOPARTIAL) == 0;
break;
case PCRE_INFO_JCHANGED:
break;
case PCRE_INFO_JCHANGED:
- *((int *)where) = (re->options & PCRE_JCHANGED) != 0;
+ *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
+ break;
+
+ case PCRE_INFO_HASCRORLF:
+ *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
break;
default: return PCRE_ERROR_BADOPTION;
break;
default: return PCRE_ERROR_BADOPTION;